diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:38 -0700 |
| commit | 666b97a27832fdf007b45c3ee48146650115e970 (patch) | |
| tree | 134ab56d86daa25c24fb3d5929a14c525d293914 | |
| parent | Merge branch 'gs/commit-graph-path-filter' (diff) | |
| parent | bisect: avoid tailing CR characters from revision in replay (diff) | |
| download | tgif-666b97a27832fdf007b45c3ee48146650115e970.tar.xz | |
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
| -rwxr-xr-x | git-bisect.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 71b367a944..08a6ed57dd 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -210,7 +210,7 @@ bisect_replay () { test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")" git bisect--helper --bisect-reset || exit oIFS="$IFS" IFS="$IFS$(printf '\015')" - while read git bisect command rev + while read git bisect command rev tail do test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue if test "$git" = "git-bisect" @@ -223,7 +223,7 @@ bisect_replay () { get_terms case "$command" in start) - cmd="bisect_start $rev" + cmd="bisect_start $rev $tail" eval "$cmd" ;; "$TERM_GOOD"|"$TERM_BAD"|skip) git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;; |