kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2020-05-24 19:39:38 -07:00
parent f37d959878 173cb08d5b
commit 666b97a278
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-bisect.sh
View File

@ -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;;