git-debrebase: Provide convert-from-unapplied aa alias for -gbp

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 654b3d1d4cc1817d378740cb2a4b3d7870b2221d..e10483894bb1084ae5693cf94c1347d959216c1a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -101,7 +101,7 @@ our %forceopts = map { $_=>0 }
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
-our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check )?
+our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
                          | git | git-ff
                          | check (?: ,ignores )?
                          | none
@@ -6218,7 +6218,7 @@ sub clean_tree_check_git_wd ($) {
     my ($message) = @_;
     return if $cleanmode =~ m{no-check};
     return if $patches_applied_dirtily; # yuk
-    clean_tree_check_git 1,
+    clean_tree_check_git +($cleanmode !~ m{all-check}),
                          (f_ <<END, $message);
 %s
 If this is just missing .gitignore entries, use a different clean
@@ -6238,6 +6238,13 @@ sub clean_tree_check () {
     } elsif ($cleanmode =~ m{^dpkg-source}) {
        clean_tree_check_git_wd __
  "tree contains uncommitted files (NB dgit didn't run rules clean)";
+    } elsif ($cleanmode =~ m{^git}) {
+       # If we were actually cleaning these files would be summarily
+       # deleted.  Since we're not, and not using the working tree
+       # anyway, we can just ignore them - nothing will use them.
+    } elsif ($cleanmode eq 'none') {
+    } else {
+       confess "$cleanmode ?";
     }
 }
 
@@ -6260,7 +6267,7 @@ sub clean_tree () {
        clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {
-       die "$cleanmode ?";
+       confess "$cleanmode ?";
     }
 }
 
@@ -7280,11 +7287,12 @@ sub parseopts () {
                } elsif (s/^-wgf$//s) {
                    push @ropts, $&;
                    $cleanmode = 'git-ff';
-               } elsif (s/^-wd(d?)([n]?)$//s) {
+               } elsif (s/^-wd(d?)([na]?)$//s) {
                    push @ropts, $&;
                    $cleanmode = 'dpkg-source';
                    $cleanmode .= '-d' if $1;
                    $cleanmode .= ',no-check' if $2 eq 'n';
+                   $cleanmode .= ',all-check' if $2 eq 'a';
                } elsif (s/^-wc$//s) {
                    push @ropts, $&;
                    $cleanmode = 'check';