Skip to content

Commit 666b97a

Browse files
committed
Merge branch 'cb/bisect-replay-with-dos-fix'
Re-fix longstanding "edited bisect log may confuse bisect replay with trailing carriage-return" issue. * cb/bisect-replay-with-dos-fix: bisect: avoid tailing CR characters from revision in replay
2 parents f37d959 + 173cb08 commit 666b97a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-bisect.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ bisect_replay () {
210210
test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
211211
git bisect--helper --bisect-reset || exit
212212
oIFS="$IFS" IFS="$IFS$(printf '\015')"
213-
while read git bisect command rev
213+
while read git bisect command rev tail
214214
do
215215
test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
216216
if test "$git" = "git-bisect"
@@ -223,7 +223,7 @@ bisect_replay () {
223223
get_terms
224224
case "$command" in
225225
start)
226-
cmd="bisect_start $rev"
226+
cmd="bisect_start $rev $tail"
227227
eval "$cmd" ;;
228228
"$TERM_GOOD"|"$TERM_BAD"|skip)
229229
git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;

0 commit comments

Comments
 (0)