diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:41 -0700 |
| commit | f9dbe28d62f9d7f110149ba78f4af7ef50ab1181 (patch) | |
| tree | 69ddef2a139b4c7c6e456979636c8849c87aee8c /t | |
| parent | Merge branch 'es/bugreport-with-hooks' (diff) | |
| parent | bisect: allow CRLF line endings in "git bisect replay" input (diff) | |
| download | tgif-f9dbe28d62f9d7f110149ba78f4af7ef50ab1181.tar.xz | |
Merge branch 'cw/bisect-replay-with-dos'
"git bisect replay" had trouble with input files when they used
CRLF line ending, which has been corrected.
* cw/bisect-replay-with-dos:
bisect: allow CRLF line endings in "git bisect replay" input
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 1313142564..ac31faefa1 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -792,6 +792,13 @@ test_expect_success 'bisect replay with old and new' ' git bisect reset ' +test_expect_success 'bisect replay with CRLF log' ' + append_cr <log_to_replay.txt >log_to_replay_crlf.txt && + git bisect replay log_to_replay_crlf.txt >bisect_result_crlf && + grep "$HASH2 is the first new commit" bisect_result_crlf && + git bisect reset +' + test_expect_success 'bisect cannot mix old/new and good/bad' ' git bisect start && git bisect bad $HASH4 && |