undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -p: only display help for active keys

Browse Source 
If the user presses a key that add -p wasn't expecting then it prints
a list of key bindings. Although the prompt only lists the active
bindings the help was printed for all bindings.  Fix this by using the
list of keys in the prompt to filter the help. Note that the list of
keys was already passed to help_patch_cmd() by the caller so there is
no change needed to the call site.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2018-02-13 10:32:39 +00:00 committed by Junio C Hamano
parent 5be1f00a9a
commit 01a6966021
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-add--interactive.perl
View File

@ -1184,7 +1184,13 @@ d - do not apply this hunk or any of the later hunks in the file"),
);
sub help_patch_cmd {
print colored $help_color, __($help_patch_modes{$patch_mode}), "\n", __ <<EOF ;
local $_;
my $other = $_[0] . ",/,?";
print colored $help_color, __($help_patch_modes{$patch_mode}), "\n",
map { "$_\n" } grep {
my $c = quotemeta(substr($_, 0, 1));
$other =~ /,$c/
} split "\n", __ <<EOF ;
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk