]> git.ipfire.org Git - thirdparty/git.git/commitdiff
test: bisect-porcelain: fix location of files
authorFelipe Contreras <felipe.contreras@gmail.com>
Fri, 18 Dec 2020 15:14:06 +0000 (09:14 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Dec 2020 21:08:39 +0000 (13:08 -0800)
Commit ba7eafe146 (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 <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6030-bisect-porcelain.sh

index aa226381be214a43e7a07aa2ffe897314938184a..52614eefc7e766b0c236526a5ee9bca1815241a5 100755 (executable)
@@ -926,14 +926,14 @@ test_expect_success 'git bisect reset cleans bisection state properly' '
        git bisect bad $HASH4 &&
        git bisect reset &&
        test -z "$(git for-each-ref "refs/bisect/*")" &&
-       test_path_is_missing "$GIT_DIR/BISECT_EXPECTED_REV" &&
-       test_path_is_missing "$GIT_DIR/BISECT_ANCESTORS_OK" &&
-       test_path_is_missing "$GIT_DIR/BISECT_LOG" &&
-       test_path_is_missing "$GIT_DIR/BISECT_RUN" &&
-       test_path_is_missing "$GIT_DIR/BISECT_TERMS" &&
-       test_path_is_missing "$GIT_DIR/head-name" &&
-       test_path_is_missing "$GIT_DIR/BISECT_HEAD" &&
-       test_path_is_missing "$GIT_DIR/BISECT_START"
+       test_path_is_missing ".git/BISECT_EXPECTED_REV" &&
+       test_path_is_missing ".git/BISECT_ANCESTORS_OK" &&
+       test_path_is_missing ".git/BISECT_LOG" &&
+       test_path_is_missing ".git/BISECT_RUN" &&
+       test_path_is_missing ".git/BISECT_TERMS" &&
+       test_path_is_missing ".git/head-name" &&
+       test_path_is_missing ".git/BISECT_HEAD" &&
+       test_path_is_missing ".git/BISECT_START"
 '
 
 test_done