diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 21:53:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 21:53:06 +0200 |
| commit | cec3f989dab861761ad83e264c3cd8a754e4ace5 (patch) | |
| tree | 77d70522bba442ac57625483a4dcbbbce078c222 /t | |
| parent | Merge branch 'rc/maint-http-local-slot-fix' (diff) | |
| parent | t6030: test skipping away from an already skipped commit (diff) | |
| download | git-cec3f989dab861761ad83e264c3cd8a754e4ace5.tar.xz git-cec3f989dab861761ad83e264c3cd8a754e4ace5.zip | |
Merge branch 'cc/bisect' (early part)
* 'cc/bisect' (early part):
t6030: test skipping away from an already skipped commit
bisect: when skipping, choose a commit away from a skipped commit
bisect: add parameters to "filter_skipped"
bisect: display first bad commit without forking a new process
bisect: drop unparse_commit() and use clear_commit_marks()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 5254b23512..4556cdd8d2 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -555,6 +555,18 @@ test_expect_success 'restricting bisection on one dir and a file' ' grep "$PARA_HASH4 is first bad commit" my_bisect_log.txt ' +test_expect_success 'skipping away from skipped commit' ' + git bisect start $PARA_HASH7 $HASH1 && + para4=$(git rev-parse --verify HEAD) && + test "$para4" = "$PARA_HASH4" && + git bisect skip && + hash7=$(git rev-parse --verify HEAD) && + test "$hash7" = "$HASH7" && + git bisect skip && + hash3=$(git rev-parse --verify HEAD) && + test "$hash3" = "$HASH3" +' + # # test_done |