mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -i: show progress counter in the prompt

Browse Source 
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>
This commit is contained in:
Kunal Tyagi
2019-09-29 22:22:59 -07:00
committed by Junio C Hamano
parent bc12974a89
commit 8085050ab4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-add--interactive.perl
View File

@ -1541,7 +1541,7 @@ sub patch_update_file {
for (@{$hunk[$ix]{DISPLAY}}) { for (@{$hunk[$ix]{DISPLAY}}) {
print; print;
} }
print colored $prompt_color, print colored $prompt_color, "(", ($ix+1), "/$num) ",
sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other); sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other);
my $line = prompt_single_character; my $line = prompt_single_character;

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

@ -314,7 +314,7 @@ test_expect_success C_LOCALE_OUTPUT 'add first line works' '
git commit -am "clear local changes" && git commit -am "clear local changes" &&
git apply patch && git apply patch &&
printf "%s\n" s y y | git add -p file 2>error | 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 && -e "/^[-+@ \\\\]"/p >output &&
test_must_be_empty error && test_must_be_empty error &&
git diff --cached >diff && git diff --cached >diff &&