From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: liu.denton@gmail.com, chwarr@microsoft.com,
garima.singh@microsoft.com,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH 2/3] bisect: remove CR characters from revision in replay
Date: Tue, 19 May 2020 20:44:43 -0700 [thread overview]
Message-ID: <20200520034444.47932-3-carenas@gmail.com> (raw)
In-Reply-To: <20200520034444.47932-1-carenas@gmail.com>
6c722cbe5a (bisect: allow CRLF line endings in "git bisect replay"
input, 2020-05-07) includes CR as a field separator, but doesn't
account for it being included in the last field, breaking when
running at least under OpenBSD 6.7's sh.
Read the revision into a raw variable and strip it of any possible
embeded CR characters, before use.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
git-bisect.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-bisect.sh b/git-bisect.sh
index 71b367a944..8cd6095a71 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -210,14 +210,15 @@ 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 rawrev
do
test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
if test "$git" = "git-bisect"
then
- rev="$command"
+ rawrev="$command"
command="$bisect"
fi
+ rev=$(echo $rawrev | tr -d '\015')
get_terms
git bisect--helper --check-and-set-terms "$command" "$TERM_GOOD" "$TERM_BAD" || exit
get_terms
--
2.27.0.rc0.187.gede8c892b8
next prev parent reply other threads:[~2020-05-20 3:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 3:44 [PATCH 0/3] openbsd: fixes for 2.27.0-RC0 Carlo Marcelo Arenas Belón
2020-05-20 3:44 ` [PATCH 1/3] t4216: avoid unnecessary subshell in test_bloom_filters_not_used Carlo Marcelo Arenas Belón
2020-05-20 15:04 ` Junio C Hamano
2020-05-20 3:44 ` Carlo Marcelo Arenas Belón [this message]
2020-05-20 14:56 ` [PATCH 2/3] bisect: remove CR characters from revision in replay Junio C Hamano
2020-05-20 17:08 ` Carlo Marcelo Arenas Belón
2020-05-20 17:14 ` Junio C Hamano
2020-05-20 20:59 ` [EXTERNAL] " Christopher Warrington (CHRISTOPHER)
2020-05-20 21:14 ` Junio C Hamano
2020-05-20 3:44 ` [PATCH 3/3] t5520: avoid alternation in grep's BRE (not POSIX) Carlo Marcelo Arenas Belón
2020-05-20 14:58 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200520034444.47932-3-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=chwarr@microsoft.com \
--cc=garima.singh@microsoft.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.