Skip to content

Commit 173cb08

Browse files
carenasgitster
authored andcommitted
bisect: avoid tailing CR characters from revision in replay
6c722cb (bisect: allow CRLF line endings in "git bisect replay" input, 2020-05-07) includes CR as a field separator, but relies on it not being included in the last field, which breaks at least when running under OpenBSD 6.7's sh. Instead of just assume the CR will get swallowed, read the rest of the line into an otherwise unused variable and ignore it everywhere except on the call for git bisect start, where it matters. Signed-off-by: Carlo Marcelo Arenas Belón <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6c722cb commit 173cb08

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)