aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-04 22:25:23 -0800
committerJunio C Hamano <gitster@pobox.com>2010-03-04 22:25:23 -0800
commitce5044df2a29c4f4979089b072aad43bccb3b9fd (patch)
tree1432db3858c686410831714052e52fbf4b7bdcdc
parent507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d (diff)
parent8f69f72fca989b3ba080aab1dc24bfd1709ce83a (diff)
downloadgit-ce5044df2a29c4f4979089b072aad43bccb3b9fd.tar.gz
git-ce5044df2a29c4f4979089b072aad43bccb3b9fd.tar.xz
Merge branch 'cc/maint-bisect-paths' into maint
* cc/maint-bisect-paths: bisect: error out when passing bad path parameters
-rw-r--r--bisect.c6
-rwxr-xr-xt/t6030-bisect-porcelain.sh5
2 files changed, 11 insertions, 0 deletions
diff --git a/bisect.c b/bisect.c
index 6dc27ee7a..b556b1161 100644
--- a/bisect.c
+++ b/bisect.c
@@ -986,6 +986,12 @@ int bisect_next_all(const char *prefix)
exit(1);
}
+ if (!all) {
+ fprintf(stderr, "No testable commit found.\n"
+ "Maybe you started with bad path parameters?\n");
+ exit(4);
+ }
+
bisect_rev = revs.commits->item->object.sha1;
memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), 41);
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index c51865fdb..3b042aacd 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -567,6 +567,11 @@ test_expect_success 'skipping away from skipped commit' '
test "$para3" = "$PARA_HASH3"
'
+test_expect_success 'erroring out when using bad path parameters' '
+ test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
+ grep "bad path parameters" error.txt
+'
+
#
#
test_done