undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cc/maint-bisect-paths' into maint

Browse Source 
* cc/maint-bisect-paths:
  bisect: error out when passing bad path parameters
This commit is contained in:
Junio C Hamano 2010-03-04 22:25:23 -08:00
commit ce5044df2a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bisect.c
View File

@ -986,6 +986,12 @@ int bisect_next_all(const char *prefix)
exit(1); 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; bisect_rev = revs.commits->item->object.sha1;
memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), 41); memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), 41);

5
t/t6030-bisect-porcelain.sh
View File

@ -567,6 +567,11 @@ test_expect_success 'skipping away from skipped commit' '
test "$para3" = "$PARA_HASH3" 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 test_done