X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=3e4741f74a48ebbc7219cbb0505ccdf1d78523fa;hb=40f91b11738a9d84bd8b329c40003d5ac5f08ec3;hp=99cb7fe29196830abc0f483bb703f169adf806d6;hpb=e5b0f5ddd4130e408391839bc9512eac55e38808;p=dgit.git

diff --git a/dgit b/dgit
index 99cb7fe2..3e4741f7 100755
--- a/dgit
+++ b/dgit
@@ -61,7 +61,7 @@ our $cleanmode;
 our $changes_since_version;
 our $rmchanges;
 our $quilt_mode;
-our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|apply';
+our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|unapplied';
 our $we_are_responder;
 our $initiator_tempdir;
 
@@ -2513,8 +2513,9 @@ END
 sub quiltify_trees_differ ($$;$) {
     my ($x,$y,$finegrained) = @_;
     # returns true iff the two tree objects differ other than in debian/
-    # returns bitmas 01 - differ in upstream files except .gitignore
-    #                02 - differ in .gitignore
+    # with $finegrained,
+    # returns bitmask 01 - differ in upstream files except .gitignore
+    #                 02 - differ in .gitignore
     local $/=undef;
     my @cmd = (@git, qw(diff-tree --name-only -z));
     push @cmd, qw(-r) if $finegrained;
@@ -2540,7 +2541,7 @@ sub quiltify_tree_sentinelfiles ($) {
 
 sub quiltify_splitbrain () {
     # memoisation via git-reflog
-    my $may_apply = $quilt_mode =~ m/gbp|apply/;
+    my $may_apply = $quilt_mode =~ m/gbp|unapplied/;
     die "xxx not yet implemented";
 #    if ($may_apply &&
 #	quiltify_trees_differ($userhead,)) {}
@@ -3024,8 +3025,8 @@ END
     }  elsif (!($user2applied & $applied2unapplied)) {
         push @failsuggestion, "This might be a patches-applied branch.";
     }
-    push @failsuggestion,
- "Maybe you need to specify one of  --quilt=apply --quilt=gbp --quilt=dpm  ?";
+    push @failsuggestion, "Maybe you need to specify one of".
+        " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
 
     if ($quilt_mode =~ m/gbp|dpm|apply/) {
 	quiltify_splitbrain();