'[git-debrebase: export and commit patches]',
];
};
- my $d = get_differs $head, $out;
- if ($d == 0) {
- return undef; # nothing to do
- } elsif ($d == D_PAT_ADD) {
- return $out; # OK
- } else {
- fail "Patch export produced patch amendments".
- " (abandoned output commit $out).".
- " Try laundering first.";
- }
+ return $out;
}
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;
- snags_maybe_bail();
- if (!$new) {
+ my $d = get_differs $old_head, $new;
+ if ($d == 0) {
fail "No (more) patches to export." unless $opt_noop_ok;
return;
+ } elsif ($d == D_PAT_ADD) {
+ snags_maybe_bail();
+ update_head_checkout $old_head, $new, 'make-patches';
+ } else {
+ print STDERR failmsg
+ "Patch export produced patch amendments".
+ " (abandoned output commit $new).".
+ " Try laundering first."
+ unless $opt_quiet_would_amend;
+ finish 7;
}
- update_head_checkout $old_head, $new, 'make-patches';
}
sub cmd_convert_from_gbp () {