Merge branch 'js/git-path-head-dot-lock-fix' into next

"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