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 replaymaint
commit
666b97a278
|
@ -210,7 +210,7 @@ bisect_replay () {
|
||||||
test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
|
test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
|
||||||
git bisect--helper --bisect-reset || exit
|
git bisect--helper --bisect-reset || exit
|
||||||
oIFS="$IFS" IFS="$IFS$(printf '\015')"
|
oIFS="$IFS" IFS="$IFS$(printf '\015')"
|
||||||
while read git bisect command rev
|
while read git bisect command rev tail
|
||||||
do
|
do
|
||||||
test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
|
test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
|
||||||
if test "$git" = "git-bisect"
|
if test "$git" = "git-bisect"
|
||||||
|
@ -223,7 +223,7 @@ bisect_replay () {
|
||||||
get_terms
|
get_terms
|
||||||
case "$command" in
|
case "$command" in
|
||||||
start)
|
start)
|
||||||
cmd="bisect_start $rev"
|
cmd="bisect_start $rev $tail"
|
||||||
eval "$cmd" ;;
|
eval "$cmd" ;;
|
||||||
"$TERM_GOOD"|"$TERM_BAD"|skip)
|
"$TERM_GOOD"|"$TERM_BAD"|skip)
|
||||||
git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
|
git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
|
||||||
|
|
Loading…
Reference in New Issue