I stumbled over this during my recent work in Git GUI [https://github.com/gitgitgadget/git/pull/361] that was originally really only intended to use the correct hooks directory. It turns out that my fears that index.lock was mishandled were unfounded, hence this patch series has a lot lower priority for me than "OMG we must push this into v2.24.0!". Technically, the first patch is not needed (because I decided against adding a test to t1400 in the end, in favor of t1500), but it shouldn't hurt, either. Changes since v1: * Clarified the commit message to state that index.lock is fine, it is logs/HEAD.lock that isn't. Johannes Schindelin (2): t1400: wrap setup code in test case git_path(): handle `.lock` files correctly path.c | 4 ++-- t/t1400-update-ref.sh | 18 ++++++++++-------- t/t1500-rev-parse.sh | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) base-commit: 108b97dc372828f0e72e56bbb40cae8e1e83ece6 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-401%2Fdscho%2Flock-files-in-worktrees-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-401/dscho/lock-files-in-worktrees-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/401 Range-diff vs v1: 1: cf97c5182e = 1: cf97c5182e t1400: wrap setup code in test case 2: f08c90ea02 ! 2: 93dba5a3a3 git_path(): handle `.lock` files correctly @@ -3,8 +3,9 @@ git_path(): handle `.lock` files correctly Ever since worktrees were introduced, the `git_path()` function _really_ - needed to be called e.g. to get at the `index`. However, the wrong path - is returned for `index.lock`. + needed to be called e.g. to get at the path to `logs/HEAD` (`HEAD` is + specific to the worktree). However, the wrong path is returned for + `logs/HEAD.lock`. This does not matter as long as the Git executable is doing the asking, as the path for that `index.lock` file is constructed from @@ -13,10 +14,12 @@ However, Git GUI just learned to use `--git-path` instead of appending relative paths to what `git rev-parse --git-dir` returns (and as a consequence not only using the correct hooks directory, but also using - the correct paths in worktrees other than the main one). And one of the - paths it is looking for is... you guessed it... `index.lock`. + the correct paths in worktrees other than the main one). While it does + not seem as if Git GUI in particular is asking for `logs/HEAD.lock`, + let's be safe rather than sorry. - So let's make that work as script writers would expect it to. + Side note: Git GUI _does_ ask for `index.lock`, but that is already + resolved correctly. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> -- gitgitgadget
