kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* cc/maint-bisect-paths:
  bisect: error out when passing bad path parameters
maint
Junio C Hamano 2010-03-07 14:53:35 -08:00
parent e8a285e553 8f69f72fca
commit 7f43e75adc
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