diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-01 19:41:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-01 19:41:04 -0700 |
| commit | 702beb3af0531bae95ab559fff043785614d53f2 (patch) | |
| tree | b92b8b82cdea891362e720dce00aac8cc911fc9a /t | |
| parent | a4103bac37d92a13fc47797c3d02becc7800e577 (diff) | |
| parent | 32d86ca53195590f8d7df9f5f58683c9a924d5af (diff) | |
| download | git-702beb3af0531bae95ab559fff043785614d53f2.tar.gz | |
Merge branch 'cc/bisect'
* cc/bisect:
Documentation: remove warning saying that "git bisect skip" may slow bisection
bisect: use a PRNG with a bias when skipping away from untestable commits
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 4556cdd8d2..1315bab595 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -563,8 +563,8 @@ test_expect_success 'skipping away from skipped commit' ' hash7=$(git rev-parse --verify HEAD) && test "$hash7" = "$HASH7" && git bisect skip && - hash3=$(git rev-parse --verify HEAD) && - test "$hash3" = "$HASH3" + para3=$(git rev-parse --verify HEAD) && + test "$para3" = "$PARA_HASH3" ' # |