git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Gustaf Hendeby <hendeby@isy.liu.se>
To: git@vger.kernel.org
Cc: chriscool@tuxfamily.org, gitster@pobox.com,
	Gustaf Hendeby <hendeby@isy.liu.se>
Subject: [PATCH] Avoid warning when bisecting a merge
Date: Thu,  4 Sep 2008 23:02:30 +0200	[thread overview]
Message-ID: <1220562150-19962-1-git-send-email-hendeby@isy.liu.se> (raw)

Trying to compare an empty string as a number results in an error,
hence make sure checkout_done is set before using it.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
---

This one should go on top of cc/bisect.

/Gustaf

 git-bisect.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/git-bisect.sh b/git-bisect.sh
index 69a9a56..05d14b3 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -437,6 +437,7 @@ bisect_next() {
 		"refs/bisect/skip-*" | tr '\012' ' ') &&
 
 	# Maybe some merge bases must be tested first
+	checkout_done=0
 	check_good_are_ancestors_of_bad "$bad" "$good" "$skip" || exit
 	test "$checkout_done" -eq "1" && checkout_done='' && return
 
-- 
1.6.0.1.320.ga0f13.dirty

             reply	other threads:[~2008-09-04 21:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-04 21:02 Gustaf Hendeby [this message]
2008-09-05  6:14 ` [PATCH] Avoid warning when bisecting a merge Christian Couder
2008-09-05  6:29   ` Junio C Hamano
2008-09-05  7:18     ` Gustaf Hendeby
2008-09-05  8:31       ` 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=1220562150-19962-1-git-send-email-hendeby@isy.liu.se \
    --to=hendeby@isy.liu.se \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).