Skip to content

Commit 33fc562

Browse files
felipecgitster
authored andcommitted
test: bisect-porcelain: fix location of files
Commit ba7eafe (t6030: explicitly test for bisection cleanup, 2017-09-29) introduced checks for files in the $GIT_DIR directory, but that variable is not always defined, and in this test file it's not. Therefore these checks always passed regardless of the presence of these files (unless the user has some /BISECT_LOG file, for some reason). Let's check the files in the correct location. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 898f807 commit 33fc562

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

t/t6030-bisect-porcelain.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -926,14 +926,14 @@ test_expect_success 'git bisect reset cleans bisection state properly' '
926926
git bisect bad $HASH4 &&
927927
git bisect reset &&
928928
test -z "$(git for-each-ref "refs/bisect/*")" &&
929-
test_path_is_missing "$GIT_DIR/BISECT_EXPECTED_REV" &&
930-
test_path_is_missing "$GIT_DIR/BISECT_ANCESTORS_OK" &&
931-
test_path_is_missing "$GIT_DIR/BISECT_LOG" &&
932-
test_path_is_missing "$GIT_DIR/BISECT_RUN" &&
933-
test_path_is_missing "$GIT_DIR/BISECT_TERMS" &&
934-
test_path_is_missing "$GIT_DIR/head-name" &&
935-
test_path_is_missing "$GIT_DIR/BISECT_HEAD" &&
936-
test_path_is_missing "$GIT_DIR/BISECT_START"
929+
test_path_is_missing ".git/BISECT_EXPECTED_REV" &&
930+
test_path_is_missing ".git/BISECT_ANCESTORS_OK" &&
931+
test_path_is_missing ".git/BISECT_LOG" &&
932+
test_path_is_missing ".git/BISECT_RUN" &&
933+
test_path_is_missing ".git/BISECT_TERMS" &&
934+
test_path_is_missing ".git/head-name" &&
935+
test_path_is_missing ".git/BISECT_HEAD" &&
936+
test_path_is_missing ".git/BISECT_START"
937937
'
938938

939939
test_done

0 commit comments

Comments
 (0)