[PATCH v3 1/1] add -i: Show progress counter in the prompt
- From
- Kunal Tyagi via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Sep 30, 2019, 05:22 UTC
- Message-ID
- <b351c74a3fc5787e8a41c12342b592d38ef0dede.1569820977.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.349.v3.git.gitgitgadget@gmail.com>
From: Kunal Tyagi <tyagi.kunal@live.com>
Report the current hunk count and total number of hunks for the current file in the prompt Adjust the expected output in some tests to account for new data on the prompt
Signed-off-by: Kunal Tyagi <tyagi.kunal@live.com> --- git-add--interactive.perl | 2 +- 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 &&
-- gitgitgadget