Skip to content

Commit

Permalink
Merge branch 'cc/maint-bisect-paths' into maint
Browse files Browse the repository at this point in the history
* cc/maint-bisect-paths:
  bisect: error out when passing bad path parameters
  • Loading branch information
Junio C Hamano committed Mar 5, 2010
2 parents 507665e + 8f69f72 commit ce5044d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
6 changes: 6 additions & 0 deletions bisect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
5 changes: 5 additions & 0 deletions t/t6030-bisect-porcelain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ce5044d

Please sign in to comment.