Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files'

A 3-year old test that was not testing anything useful has been
corrected.

* fc/t6030-bisect-reset-removes-auxiliary-files:
  test: bisect-porcelain: fix location of files

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index aa226381be214a43e7a07aa2ffe897314938184a..52614eefc7e766b0c236526a5ee9bca1815241a5 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -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