From 61b51ad1c4b8b949f83c420fa3c2b92215643037 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 17 Nov 2015 01:28:04 +0000
Subject: [PATCH] Split brain: Rename quilt mode `apply' to `unapplied'

---
 dgit | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dgit b/dgit
index 99cb7fe2..4ac5748b 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;
 
@@ -2540,7 +2540,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 +3024,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();
-- 
2.30.2