@matheusbsbs / matheus-bagliano / commits / 76a53d640f
Fork 0

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 path to `logs/HEAD` (`HEAD` is specific to the worktree, and therefore so is its reflog). 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 `logs/HEAD.lock` file is constructed from `git_path("logs/HEAD")` by appending the `.lock` suffix. 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). While it does not seem as if Git GUI in particular is asking for `logs/HEAD.lock`, let's be safe rather than sorry. Side note: Git GUI _does_ ask for `index.lock`, but that is already resolved correctly, due to `update_common_dir()` preferring to leave unknown paths in the (worktree-specific) git directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Oct 28, 2019 at 12:57 UTC 76a53d640f72fc77e7e9358dfeb5df5ece56515f
2 files changed +8
path.c
+6
@@ -11,6 +11,7 @@
11 #include "path.h"
12 #include "packfile.h"
13 #include "object-store.h"
14 +#include "lockfile.h"
15
16 static int get_st_mode_bits(const char *path, int *mode)
17 {
@@ -350,9 +351,14 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len,
351 const char *common_dir)
352 {
353 char *base = buf->buf + git_dir_len;
354 + int has_lock_suffix = strbuf_strip_suffix(buf, LOCK_SUFFIX);
355 +
356 init_common_trie();
357 if (trie_find(&common_trie, base, check_common, NULL) > 0)
358 replace_dir(buf, git_dir_len, common_dir);
359 +
360 + if (has_lock_suffix)
361 + strbuf_addstr(buf, LOCK_SUFFIX);
362 }
363
364 void report_linked_checkout_garbage(void)
t/t0060-path-utils.sh
+2
@@ -285,8 +285,10 @@ test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo
285 test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2
286 test_expect_success 'setup common repository' 'git --git-dir=bar init'
287 test_git_path GIT_COMMON_DIR=bar index .git/index
288 +test_git_path GIT_COMMON_DIR=bar index.lock .git/index.lock
289 test_git_path GIT_COMMON_DIR=bar HEAD .git/HEAD
290 test_git_path GIT_COMMON_DIR=bar logs/HEAD .git/logs/HEAD
291 +test_git_path GIT_COMMON_DIR=bar logs/HEAD.lock .git/logs/HEAD.lock
292 test_git_path GIT_COMMON_DIR=bar logs/refs/bisect/foo .git/logs/refs/bisect/foo
293 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec/foo bar/logs/refs/bisec/foo
294 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec bar/logs/refs/bisec