summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAustin English <austinenglish@gmail.com>2016-02-12 07:56:17 -0600
committerAustin English <austinenglish@gmail.com>2016-02-12 07:57:34 -0600
commit16c7a5059a7614bdb9cbd1474919fa8ada6a2941 (patch)
tree336928a3a831775632d89386c53dd10c93592485
parent8462f1a2b27a4b97baa095e33effd5d0a500fc80 (diff)
Rakefile: print git status when there are uncommitted changesfeature/11108-improve-rakefile
Signed-off-by: Austin English <austinenglish@gmail.com>
-rw-r--r--Rakefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Rakefile b/Rakefile
index ae2acc1..56fc716 100644
--- a/Rakefile
+++ b/Rakefile
@@ -194,19 +194,22 @@ task :parse_build_options do
end
task :ensure_clean_repository do
- unless `git status --porcelain`.empty?
+ git_status = `git status --porcelain`
+ unless git_status.empty?
if ENV['TAILS_BUILD_IGNORE_CHANGES']
$stderr.puts <<-END_OF_MESSAGE.gsub(/^ /, '')
You have uncommitted changes in the Git repository. They will
- be ignored for the upcoming build.
+ be ignored for the upcoming build:
+ #{git_status}
END_OF_MESSAGE
else
$stderr.puts <<-END_OF_MESSAGE.gsub(/^ /, '')
You have uncommitted changes in the Git repository. Due to limitations
- of the build system, you need to commit them before building Tails.
+ of the build system, you need to commit them before building Tails:
+ #{git_status}
If you don't care about those changes and want to build Tails nonetheless,
please add `ignorechanges` to the TAILS_BUILD_OPTIONS environment