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 /t/t3701-add-interactive.sh | |
| parent | Merge branch 'js/stash-apply-in-secondary-worktree' (diff) | |
| parent | add -i: show progress counter in the prompt (diff) | |
| download | tgif-f0d407e6ae8dfe89683d86ebaba5f6f08959e8b3.tar.xz | |
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
Diffstat (limited to 't/t3701-add-interactive.sh')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |