git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: chriscool@tuxfamily.org, gitster@pobox.com, j6t@kdbg.org,
	jnareb@gmail.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v14 2/8] bisect: use && to connect statements that are deferred with eval.
Date: Wed,  3 Aug 2011 08:15:56 +1000	[thread overview]
Message-ID: <1312323362-20096-3-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312323362-20096-1-git-send-email-jon.seymour@gmail.com>

Christian Couder pointed out that the existing eval strategy
swallows an initial non-zero return. Using && to connect
the statements should fix this.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 git-bisect.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-bisect.sh b/git-bisect.sh
index 20f6dd5..a44ffe1 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -86,7 +86,7 @@ bisect_start() {
 		0) state='bad' ; bad_seen=1 ;;
 		*) state='good' ;;
 		esac
-		eval="$eval bisect_write '$state' '$rev' 'nolog'; "
+		eval="$eval bisect_write '$state' '$rev' 'nolog' &&"
 		shift
 		;;
 	    esac
@@ -145,7 +145,7 @@ bisect_start() {
 	#
 	echo "$start_head" >"$GIT_DIR/BISECT_START" &&
 	git rev-parse --sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" &&
-	eval "$eval" &&
+	eval "$eval true" &&
 	echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
 	#
 	# Check if we can proceed to the next bisect state.
-- 
1.7.6.353.gb3ae7e

  parent reply	other threads:[~2011-08-02 22:16 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-02 22:15 [PATCH v14 0/8] bisect: Add support for --no-checkout option Jon Seymour
2011-08-02 22:15 ` [PATCH v14 1/8] bisect: move argument parsing before state modification Jon Seymour
2011-08-02 22:15 ` Jon Seymour [this message]
2011-08-02 22:15 ` [PATCH v14 3/8] bisect: add tests to document expected behaviour in presence of broken trees Jon Seymour
2011-08-02 22:15 ` [PATCH v14 4/8] bisect: introduce support for --no-checkout option Jon Seymour
2011-08-02 22:15 ` [PATCH v14 5/8] bisect: introduce --no-checkout support into porcelain Jon Seymour
2011-08-02 23:01   ` Junio C Hamano
2011-08-02 23:16     ` Junio C Hamano
2011-08-03  5:28       ` Christian Couder
2011-08-03 13:16       ` Jon Seymour
2011-08-03 15:24         ` Jon Seymour
2011-08-03 17:01           ` Junio C Hamano
2011-08-03 18:57     ` Jonathan Nieder
2011-08-03 21:40       ` Jon Seymour
2011-08-03 21:45         ` Jonathan Nieder
2011-08-03  5:17   ` Christian Couder
2011-08-02 22:16 ` [PATCH v14 6/8] bisect: add tests for the --no-checkout option Jon Seymour
2011-08-02 22:16 ` [PATCH v14 7/8] bisect: add documentation for " Jon Seymour
2011-08-02 22:16 ` [PATCH v14 8/8] bisect: change bisect function to update BISECT_HEAD, rather than HEAD Jon Seymour
2011-08-03  4:43   ` Christian Couder

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=1312323362-20096-3-git-send-email-jon.seymour@gmail.com \
    --to=jon.seymour@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=jnareb@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 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).