Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
}
sub cmd_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;
badusage "no arguments allowed" if @ARGV;
my $old_head = get_head();
my $new = make_patches $old_head;
print STDERR failmsg
"Patch export produced patch amendments".
" (abandoned output commit $new).".
print STDERR failmsg
"Patch export produced patch amendments".
" (abandoned output commit $new).".
- " Try laundering first.";
+ " Try laundering first."
+ unless $opt_quiet_would_amend;
We may want to introduce an incompatible replacement syntax
under the name C<new-upstream>.
We may want to introduce an incompatible replacement syntax
under the name C<new-upstream>.
-=item git-debrebase make-patches
+=item git-debrebase make-patches [--quiet-would-amend]
Generate patches in debian/patches/
representing the changes made to upstream files.
Generate patches in debian/patches/
representing the changes made to upstream files.
changes to upstream files have been committed,
running it again can add the missing patches.
changes to upstream files have been committed,
running it again can add the missing patches.
+If the patches implied by the current branch
+are not a simple superset of those already in debian/patches,
+make-patches will fail with exit status 7,
+and an error message.
+(The message can be suppress with --quiet-would-amend.)
+
=item git-debrebase convert-from-gbp [<upstream-commit-ish>]
Cnnverts a gbp patches-unapplied branch
=item git-debrebase convert-from-gbp [<upstream-commit-ish>]
Cnnverts a gbp patches-unapplied branch