diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 22:56:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 22:56:08 +0300 |
| commit | 722f53ca2feed5e41c2270fdaae25bde5b7582f4 (patch) | |
| tree | 42bc9e92378e31f58631a7ab563ce0b0de6dcf87 /t | |
| parent | d87aa329354be3d93c70547f4ed6fe52103ed1b5 (diff) | |
| parent | b577bb925e745845155c6f51eae841c339ce68f6 (diff) | |
Merge branch 'cw/bisect'
* cw/bisect:
Eliminate confusing "won't bisect on seeked tree" failure
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index ec71123f4b..4908e878fe 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -260,7 +260,7 @@ test_expect_success 'bisect starting with a detached HEAD' ' git checkout master^ && HEAD=$(git rev-parse --verify HEAD) && git bisect start && - test $HEAD = $(cat .git/head-name) && + test $HEAD = $(cat .git/BISECT_START) && git bisect reset && test $HEAD = $(git rev-parse --verify HEAD) |