diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:48 +0900 |
| commit | f0d407e6ae8dfe89683d86ebaba5f6f08959e8b3 (patch) | |
| tree | 1ec74f3a8679cb8f59d7901a7042511d739ef81c | |
| parent | Merge branch 'js/stash-apply-in-secondary-worktree' (diff) | |
| parent | add -i: show progress counter in the prompt (diff) | |
| download | git-f0d407e6ae8dfe89683d86ebaba5f6f08959e8b3.tar.gz git-f0d407e6ae8dfe89683d86ebaba5f6f08959e8b3.zip | |
Merge branch 'kt/add-i-progress'
"git add -i" has been taught to show the total number of hunks and
the hunks that has been processed so far when showing prompts.
* kt/add-i-progress:
add -i: show progress counter in the prompt
| -rwxr-xr-x | git-add--interactive.perl | 2 | ||||
| -rwxr-xr-x | t/t3701-add-interactive.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index c20ae9e210..52659bb74c 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1541,7 +1541,7 @@ sub patch_update_file { for (@{$hunk[$ix]{DISPLAY}}) { print; } - print colored $prompt_color, + print colored $prompt_color, "(", ($ix+1), "/$num) ", sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other); my $line = prompt_single_character; diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 69991a3168..d50e165ca8 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -314,7 +314,7 @@ test_expect_success C_LOCALE_OUTPUT 'add first line works' ' git commit -am "clear local changes" && git apply patch && printf "%s\n" s y y | git add -p file 2>error | - sed -n -e "s/^Stage this hunk[^@]*\(@@ .*\)/\1/" \ + sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \ -e "/^[-+@ \\\\]"/p >output && test_must_be_empty error && git diff --cached >diff && |