diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-06 01:34:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-06 01:34:58 +0300 |
| commit | 76c57fedfa8a15bd341c0059bff164a049fe1d5c (patch) | |
| tree | 5b4a2fd0b9b73b2614ea1b0ef1b048a3b7df4d7c /t/t3701-add-interactive.sh | |
| parent | 9a5315edfdf662c4d9bf444ebc297bc802fa5e04 (diff) | |
| parent | b2627cc3d4be2f8086711097f99d79a32c6a703a (diff) | |
Merge branch 'js/add-p-leftover-bits'
The final leg of rewriting "add -i/-p" in C.
* js/add-p-leftover-bits:
ci: include the built-in `git add -i` in the `linux-gcc` job
built-in add -p: handle Escape sequences more efficiently
built-in add -p: handle Escape sequences in interactive.singlekey mode
built-in add -p: respect the `interactive.singlekey` config setting
terminal: add a new function to read a single keystroke
terminal: accommodate Git for Windows' default terminal
terminal: make the code of disable_echo() reusable
built-in add -p: handle diff.algorithm
built-in add -p: support interactive.diffFilter
t3701: adjust difffilter test
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 2182b1c030..e36fd0a5d3 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -570,7 +570,7 @@ test_expect_success 'detect bogus diffFilter output' ' git reset --hard && echo content >test && - test_config interactive.diffFilter "echo too-short" && + test_config interactive.diffFilter "sed 1d" && printf y >y && test_must_fail force_color git add -p <y ' |