diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-26 21:09:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-26 21:09:31 (GMT) |
| commit | 54e6ce5960689026f1ea97db493dc8cd0a7f8e1e (patch) | |
| tree | 504f97bb1425d2f9ff1603be45130487a6355c44 /t/t3701-add-interactive.sh | |
| parent | e25a76721ccc6049ec720e86707ec368574e8a71 (diff) | |
| parent | d85d7ecb80ebc93f7380b4196c303756ee051668 (diff) | |
| download | git-54e6ce5960689026f1ea97db493dc8cd0a7f8e1e.zip git-54e6ce5960689026f1ea97db493dc8cd0a7f8e1e.tar.gz git-54e6ce5960689026f1ea97db493dc8cd0a7f8e1e.tar.bz2 | |
Merge branch 'jk/add-p-commentchar-fix'
"git add -p" were updated in 2.12 timeframe to cope with custom
core.commentchar but the implementation was buggy and a
metacharacter like $ and * did not work.
* jk/add-p-commentchar-fix:
add--interactive: quote commentChar regex
add--interactive: handle EOF in prompt_yesno
Diffstat (limited to 't/t3701-add-interactive.sh')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 2ecb43a..2f3e7ce 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -477,4 +477,12 @@ test_expect_success 'add -p does not expand argument lists' ' ! grep not-changed trace.out ' +test_expect_success 'hunk-editing handles custom comment char' ' + git reset --hard && + echo change >>file && + test_config core.commentChar "\$" && + echo e | GIT_EDITOR=true git add -p && + git diff --exit-code +' + test_done |