Skip to content

Commit

Permalink
Correct help blurb in checkout -p and friends
Browse files Browse the repository at this point in the history
When git checkout -p from the index or HEAD is run in edit mode, the
help message about removing '-' and '+' lines was backwards. Because it
is reverse applying the patch, the meanings of '-' and '+' are reversed.

Signed-off-by: Jonathan "Duke" Leto <jonathan@leto.net>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan "Duke" Leto authored and Junio C Hamano committed Oct 28, 2010
1 parent 8a90438 commit 7b8c705
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions git-add--interactive.perl
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ sub colored {
TARGET => '',
PARTICIPLE => 'staging',
FILTER => 'file-only',
IS_REVERSE => 0,
},
'stash' => {
DIFF => 'diff-index -p HEAD',
Expand All @@ -96,6 +97,7 @@ sub colored {
TARGET => '',
PARTICIPLE => 'stashing',
FILTER => undef,
IS_REVERSE => 0,
},
'reset_head' => {
DIFF => 'diff-index -p --cached',
Expand All @@ -105,6 +107,7 @@ sub colored {
TARGET => '',
PARTICIPLE => 'unstaging',
FILTER => 'index-only',
IS_REVERSE => 1,
},
'reset_nothead' => {
DIFF => 'diff-index -R -p --cached',
Expand All @@ -114,6 +117,7 @@ sub colored {
TARGET => ' to index',
PARTICIPLE => 'applying',
FILTER => 'index-only',
IS_REVERSE => 0,
},
'checkout_index' => {
DIFF => 'diff-files -p',
Expand All @@ -123,6 +127,7 @@ sub colored {
TARGET => ' from worktree',
PARTICIPLE => 'discarding',
FILTER => 'file-only',
IS_REVERSE => 1,
},
'checkout_head' => {
DIFF => 'diff-index -p',
Expand All @@ -132,6 +137,7 @@ sub colored {
TARGET => ' from index and worktree',
PARTICIPLE => 'discarding',
FILTER => undef,
IS_REVERSE => 1,
},
'checkout_nothead' => {
DIFF => 'diff-index -R -p',
Expand All @@ -141,6 +147,7 @@ sub colored {
TARGET => ' to index and worktree',
PARTICIPLE => 'applying',
FILTER => undef,
IS_REVERSE => 0,
},
);

Expand Down Expand Up @@ -999,10 +1006,12 @@ sub edit_hunk_manually {
print $fh "# Manual hunk edit mode -- see bottom for a quick guide\n";
print $fh @$oldtext;
my $participle = $patch_mode_flavour{PARTICIPLE};
my $is_reverse = $patch_mode_flavour{IS_REVERSE};
my ($remove_plus, $remove_minus) = $is_reverse ? ('-', '+') : ('+', '-');
print $fh <<EOF;
# ---
# To remove '-' lines, make them ' ' lines (context).
# To remove '+' lines, delete them.
# To remove '$remove_minus' lines, make them ' ' lines (context).
# To remove '$remove_plus' lines, delete them.
# Lines starting with # will be removed.
#
# If the patch applies cleanly, the edited hunk will immediately be
Expand Down

0 comments on commit 7b8c705

Please sign in to comment.