summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 21:27:36 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-17 11:51:00 +0100
commitca261d36408442d8f3beeac12434af95810b1e32 (patch)
tree3b2a204daa04e4aa4b8d11a73dd665973c7371cc /git-debrebase
parent2f538edde0ceb8dc747dd481e2e80ab2f36555d7 (diff)
git-debrebase: make-patched: Provide --quiet-would-amend
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 111bb1f..e5cafd1 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1505,6 +1505,9 @@ sub make_patches ($) {
}
sub cmd_make_patches () {
+ my $opt_quiet_would_amend;
+ GetOptions('quiet-would-amend!', \$opt_quiet_would_amend)
+ or die badusage("bad options to make-patches");
badusage "no arguments allowed" if @ARGV;
my $old_head = get_head();
my $new = make_patches $old_head;
@@ -1519,7 +1522,8 @@ sub cmd_make_patches () {
print STDERR failmsg
"Patch export produced patch amendments".
" (abandoned output commit $new).".
- " Try laundering first.";
+ " Try laundering first."
+ unless $opt_quiet_would_amend;
finish 7;
}
}