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

diff --cc path.c
Simple merge

diff --cc t/t0060-path-utils.sh
index 501e1a288df4c5876f72cc5c2397c574965b7cbd,2aca8ccff9a07592c155bd583abb8a0ee81d3d5f..553e94bc5a7a41314121871e6958d2d32f20dc74
--- 1/t/t0060-path-utils.sh
--- 2/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