bisect: print an error message when "git rev-list --bisect-vars" fails

chriscool · gitster · commit 42ba5ee776c0 · 2008-05-08T17:50:00.000-07:00
Before this patch no error was printed when "git rev-list --bisect-vars"
failed. This can happen when bad and good revs are mistaken.

This patch prints an error message on stderr that describe the likely
failure cause.

Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-bisect.sh b/git-bisect.sh
@@ -220,18 +220,33 @@ bisect_auto_next() {
 	bisect_next_check && bisect_next || :
 }
 
+eval_rev_list() {
+	_eval="$1"
+
+	eval $_eval
+	res=$?
+
+	if [ $res -ne 0 ]; then
+		echo >&2 "'git rev-list --bisect-vars' failed:"
+		echo >&2 "maybe you mistake good and bad revs?"
+		exit $res
+	fi
+
+	return $res
+}
+
 filter_skipped() {
 	_eval="$1"
 	_skip="$2"
 
 	if [ -z "$_skip" ]; then
-		eval $_eval
+		eval_rev_list "$_eval"
 		return
 	fi
 
 	# Let's parse the output of:
 	# "git rev-list --bisect-vars --bisect-all ..."
-	eval $_eval | while read hash line
+	eval_rev_list "$_eval" | while read hash line
 	do
 		case "$VARS,$FOUND,$TRIED,$hash" in
 			# We display some vars.
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
@@ -302,6 +302,13 @@ test_expect_success 'bisect refuses to start if branch new-bisect exists' '
 	git branch -d new-bisect
 '
 
+test_expect_success 'bisect errors out if bad and good are mistaken' '
+	git bisect reset &&
+	test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
+	grep "mistake good and bad" rev_list_error &&
+	git bisect reset
+'
+
 #
 #
 test_done

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,13 @@ test_expect_success 'bisect refuses to start if branch new-bisect exists' '`
`302`	`302`	`git branch -d new-bisect`
`303`	`303`	`'`
`304`	`304`
	`305`	`+test_expect_success 'bisect errors out if bad and good are mistaken' '`
	`306`	`+ git bisect reset &&`
	`307`	`+ test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&`
	`308`	`+ grep "mistake good and bad" rev_list_error &&`
	`309`	`+ git bisect reset`
	`310`	`+'`
	`311`	`+`
`305`	`312`	`#`
`306`	`313`	`#`
`307`	`314`	`test_done`