bisect: use && to connect statements that are deferred with eval.
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jon Seymour committed
Aug 4, 2011 at 22:00 UTC
6ba7acffdd24e9ed9b31e503ce87f2af31cd0883
1 file changed
+2
-2
git-bisect.sh
+2
-2
@@ -86,7 +86,7 @@ bisect_start() {
86
0) state='bad' ; bad_seen=1 ;;
87
*) state='good' ;;
88
esac
89
- eval="$eval bisect_write '$state' '$rev' 'nolog'; "
89
+ eval="$eval bisect_write '$state' '$rev' 'nolog' &&"
90
shift
91
;;
92
esac
@@ -145,7 +145,7 @@ bisect_start() {
145
#
146
echo "$start_head" >"$GIT_DIR/BISECT_START" &&
147
git rev-parse --sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" &&
148
- eval "$eval" &&
148
+ eval "$eval true" &&
149
echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
150
#
151
# Check if we can proceed to the next bisect state.