From: Junio C Hamano Date: Sun, 1 Dec 2019 17:04:29 +0000 (-0800) Subject: Merge branch 'js/git-path-head-dot-lock-fix' X-Git-Tag: v2.25.0-rc0~131 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2b0451434db903975cb1dfda0eafef939ebc6db;p=thirdparty%2Fgit.git Merge branch 'js/git-path-head-dot-lock-fix' "git rev-parse --git-path HEAD.lock" did not give the right path when run in a secondary worktree. * js/git-path-head-dot-lock-fix: git_path(): handle `.lock` files correctly t1400: wrap setup code in test case --- a2b0451434db903975cb1dfda0eafef939ebc6db diff --cc t/t0060-path-utils.sh index 501e1a288d,2aca8ccff9..553e94bc5a --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@@ -285,11 -285,11 +285,13 @@@ test_git_path GIT_OBJECT_DIRECTORY=foo test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2 test_expect_success 'setup common repository' 'git --git-dir=bar init' test_git_path GIT_COMMON_DIR=bar index .git/index + test_git_path GIT_COMMON_DIR=bar index.lock .git/index.lock test_git_path GIT_COMMON_DIR=bar HEAD .git/HEAD test_git_path GIT_COMMON_DIR=bar logs/HEAD .git/logs/HEAD + test_git_path GIT_COMMON_DIR=bar logs/HEAD.lock .git/logs/HEAD.lock test_git_path GIT_COMMON_DIR=bar logs/refs/bisect/foo .git/logs/refs/bisect/foo +test_git_path GIT_COMMON_DIR=bar logs/refs bar/logs/refs +test_git_path GIT_COMMON_DIR=bar logs/refs/ bar/logs/refs/ test_git_path GIT_COMMON_DIR=bar logs/refs/bisec/foo bar/logs/refs/bisec/foo test_git_path GIT_COMMON_DIR=bar logs/refs/bisec bar/logs/refs/bisec test_git_path GIT_COMMON_DIR=bar logs/refs/bisectfoo bar/logs/refs/bisectfoo