Locked paths can be saved in a linked list so that if something wrong
happens, *.lock are removed. For relative paths, this works fine if we
keep cwd the same, which is true 99% of time except:

- update-index and read-tree hold the lock on $GIT_DIR/index really
  early, then later on may call setup_work_tree() to move cwd.

- Suppose a lock is being held (e.g. by "git add") then somewhere
  down the line, somebody calls real_path (e.g. "link_alt_odb_entry"),
  which temporarily moves cwd away and back.

During that time when cwd is moved (either permanently or temporarily)
and we decide to die(), attempts to remove relative *.lock will fail,
and the next operation will complain that some files are still locked.

Avoid this case by turning relative paths to absolute before storing
the path in "filename" field.

Reported-by: Yue Lin Ho <yuelinho...@gmail.com>
Helped-by: Ramsay Jones <ram...@ramsay1.demon.co.uk>
Helped-by: Johannes Sixt <j...@kdbg.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 lockfile.c                    | 10 +++++-----
 t/t2107-update-index-basic.sh | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lockfile.c b/lockfile.c
index 154915f..0aa70a5 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -117,13 +117,13 @@ static char *resolve_symlink(const char *in)
 
 static int lock_file(struct lock_file *lk, const char *path, int flags)
 {
-       int len;
+       struct strbuf sb = STRBUF_INIT;
+
        if (!(flags & LOCK_NODEREF) && !(path = resolve_symlink(path)))
                return -1;
-       len = strlen(path) + 5; /* .lock */
-       lk->filename = xmallocz(len);
-       strcpy(lk->filename, path);
-       strcat(lk->filename, ".lock");
+       strbuf_add_absolute_path(&sb, path);
+       strbuf_addstr(&sb, ".lock");
+       lk->filename = strbuf_detach(&sb, NULL);
        lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
        if (0 <= lk->fd) {
                if (!lock_file_list) {
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
index 1bafb90..dfe02f4 100755
--- a/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@ -65,4 +65,19 @@ test_expect_success '--cacheinfo mode,sha1,path (new 
syntax)' '
        test_cmp expect actual
 '
 
+test_expect_success '.lock files cleaned up' '
+       mkdir cleanup &&
+       (
+       cd cleanup &&
+       mkdir worktree &&
+       git init repo &&
+       cd repo &&
+       git config core.worktree ../../worktree &&
+       # --refresh triggers late setup_work_tree,
+       # active_cache_changed is zero, rollback_lock_file fails
+       git update-index --refresh &&
+       ! test -f .git/index.lock
+       )
+'
+
 test_done
-- 
2.1.0.rc0.78.gc0d8480

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to