]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 190b887 c33a5c9)
Merge branch 'js/git-path-head-dot-lock-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 03:30:23 +0000 (12:30 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 03:30:23 +0000 (12:30 +0900)
commit3a7533c17102a485fea58f251cf907d65b3a2bcc
tree2246047d49e64be8bce1644e554da40d6beeadb0tree | snapshot
parent190b88709e3d704c31db0016d9cd24da3c9b1257commit | diff
parentc33a5c9b54d512835c373fa2c5d054c68705f370commit | diff
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
path.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.