summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunal Tyagi <tyagi.kunal@live.com>2019-09-30 05:22:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-03 22:12:19 (GMT)
commit8085050ab4e29f442f305e338e6eea750540190e (patch)
tree67d96abe4935ae517aeaf814baff1f7430aa47cf
parentbc12974a897308fd3254cf0cc90319078fe45eea (diff)
downloadgit-8085050ab4e29f442f305e338e6eea750540190e.zip
git-8085050ab4e29f442f305e338e6eea750540190e.tar.gz
git-8085050ab4e29f442f305e338e6eea750540190e.tar.bz2
add -i: show progress counter in the prompt
Report the current hunk count and total number of hunks for the current file in the prompt. Also adjust the expected output in some tests to match. Signed-off-by: Kunal Tyagi <tyagi.kunal@live.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-add--interactive.perl2
-rwxr-xr-xt/t3701-add-interactive.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index c20ae9e..52659bb 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 69991a3..d50e165 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 &&