summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorChristopher Warrington <chwarr@microsoft.com>2020-05-07 21:29:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-08 17:54:27 (GMT)
commit6c722cbe5a919166eb0d7369762b09393eb5b518 (patch)
treeb9654b4a12e8576e8cfde9a570d433d44908166b /t
parentaf6b65d45ef179ed52087e80cb089f6b2349f4ec (diff)
downloadgit-6c722cbe5a919166eb0d7369762b09393eb5b518.zip
git-6c722cbe5a919166eb0d7369762b09393eb5b518.tar.gz
git-6c722cbe5a919166eb0d7369762b09393eb5b518.tar.bz2
bisect: allow CRLF line endings in "git bisect replay" input
We advertise that the bisect log can be corrected in your editor before being fed to "git bisect replay", but some editors may turn the line endings to CRLF. Update the parser of the input lines so that the CR at the end of the line gets ignored. Were anyone to intentionally be using terms/revs with embedded CRs, replaying such bisects will no longer work with this change. I suspect that this is incredibly rare. Signed-off-by: Christopher Warrington <chwarr@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t6030-bisect-porcelain.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 821a0c8..bb84c8a 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 &&