From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Seymour Subject: [PATCH v15 2/7] bisect: use && to connect statements that are deferred with eval. Date: Thu, 4 Aug 2011 01:03:26 +1000 Message-ID: <1312383811-7130-3-git-send-email-jon.seymour@gmail.com> References: <1312383811-7130-1-git-send-email-jon.seymour@gmail.com> Cc: chriscool@tuxfamily.org, gitster@pobox.com, j6t@kdbg.org, jnareb@gmail.com, Jon Seymour To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Aug 03 17:04:27 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Qoczf-0001iL-HK for gcvg-git-2@lo.gmane.org; Wed, 03 Aug 2011 17:04:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754827Ab1HCPES (ORCPT ); Wed, 3 Aug 2011 11:04:18 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:43862 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754813Ab1HCPEQ (ORCPT ); Wed, 3 Aug 2011 11:04:16 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so190655pzk.1 for ; Wed, 03 Aug 2011 08:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=q6+uvDUTxxKbH/ZxPs6g6ACs/UzxG2bdfhsIL/7zMvE=; b=PT65D+A77o9dTtrTrRgiT6BJfhg759MU7o+M/KZwx/wb9zrsxzeyVU5D3mCPvexXZW tr+llS+PufMKI4FuNa501Yl8srS6EUE8okRXmwgZgq5I/53OfFSEUZKcuUFzVyUAv1HJ hxU3Sk/fJaevP344BBmnqS+v9co4Le8OihyDE= Received: by 10.143.79.17 with SMTP id g17mr4744554wfl.22.1312383855630; Wed, 03 Aug 2011 08:04:15 -0700 (PDT) Received: from localhost.localdomain ([120.16.210.46]) by mx.google.com with ESMTPS id d1sm1133916pbj.88.2011.08.03.08.04.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 08:04:14 -0700 (PDT) X-Mailer: git-send-email 1.7.6.352.gd542a2 In-Reply-To: <1312383811-7130-1-git-send-email-jon.seymour@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- 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.352.gd542a2