diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-11-17 01:28:04 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 16:47:47 +0100 |
commit | 61b51ad1c4b8b949f83c420fa3c2b92215643037 (patch) | |
tree | d5ac8a0d893d8cf59dd0f2fc537f866d6ca181dd /dgit | |
parent | e5b0f5ddd4130e408391839bc9512eac55e38808 (diff) |
Split brain: Rename quilt mode `apply' to `unapplied'
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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(); |