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

Merge branch 'jk/add-i-patch-do-prompt'

Browse Source 
The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection.  Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.

* jk/add-i-patch-do-prompt:
  add--interactive: fix missing file prompt for patch mode with "-i"
This commit is contained in:
Junio C Hamano 2017-03-12 23:21:33 -07:00
commit fb070d2f17
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-add--interactive.perl
View File

@ -92,7 +92,7 @@ sub colored {
} }
# command line options # command line options
my $cmd; my $patch_mode_only;
my $patch_mode; my $patch_mode;
my $patch_mode_revision; my $patch_mode_revision;
@ -1299,7 +1299,7 @@ sub patch_update_cmd {
} }
return 0; return 0;
} }
if ($patch_mode) { if ($patch_mode_only) {
@them = @mods; @them = @mods;
} }
else { else {
@ -1721,7 +1721,7 @@ sub process_args {
die sprintf(__("invalid argument %s, expecting --"), die sprintf(__("invalid argument %s, expecting --"),
$arg) unless $arg eq "--"; $arg) unless $arg eq "--";
%patch_mode_flavour = %{$patch_modes{$patch_mode}}; %patch_mode_flavour = %{$patch_modes{$patch_mode}};
$cmd = 1; $patch_mode_only = 1;
} }
elsif ($arg ne "--") { elsif ($arg ne "--") {
die sprintf(__("invalid argument %s, expecting --"), $arg); die sprintf(__("invalid argument %s, expecting --"), $arg);
@ -1758,7 +1758,7 @@ sub main_loop {
process_args(); process_args();
refresh(); refresh();
if ($cmd) { if ($patch_mode_only) {
patch_update_cmd(); patch_update_cmd();
} }
else { else {

18
t/t3701-add-interactive.sh
View File

@ -394,4 +394,22 @@ test_expect_success 'diffs can be colorized' '
grep "$(printf "\\033")" output grep "$(printf "\\033")" output
' '
test_expect_success 'patch-mode via -i prompts for files' '
git reset --hard &&
echo one >file &&
echo two >test &&
git add -i <<-\EOF &&
patch
test
y
quit
EOF
echo test >expect &&
git diff --cached --name-only >actual &&
test_cmp expect actual
'
test_done test_done