worktree: stop supporting moving worktrees manually
The current update_linked_gitdir() has a bug that can create "gitdir" file in non-multi-worktree setup. Worse, sometimes it can write relative path to "gitdir" file, which will not work (e.g. "git worktree list" will display the worktree's location incorrectly) Instead of fixing this, we step back a bit. The original design was probably not well thought out. For now, if the user manually moves a worktree, they have to fix up "gitdir" file manually or the worktree will get pruned. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jan 22, 2016 at 15:35 UTC
618244e160cb0777bc8d41055f7de0192b10ea0f
2 files changed
+10
-17
Documentation/git-worktree.txt
+10
-5
@@ -32,11 +32,9 @@ The working tree's administrative files in the repository (see
32
`git worktree prune` in the main or any linked working tree to
33
clean up any stale administrative files.
34
35
-If you move a linked working tree to another file system, or
36
-within a file system that does not support hard links, you need to run
37
-at least one git command inside the linked working tree
38
-(e.g. `git status`) in order to update its administrative files in the
39
-repository so that they do not get automatically pruned.
35
+If you move a linked working tree, you need to manually update the
36
+administrative files so that they do not get pruned automatically. See
37
+section "DETAILS" for more information.
38
39
If a linked working tree is stored on a portable device or network share
40
which is not always mounted, you can prevent its administrative files from
@@ -137,6 +135,13 @@ thumb is do not make any assumption about whether a path belongs to
135
$GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
136
inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
137
138
+If you move a linked working tree, you need to update the 'gitdir' file
139
+in the entry's directory. For example, if a linked working tree is moved
140
+to `/newpath/test-next` and its `.git` file points to
141
+`/path/main/.git/worktrees/test-next`, then update
142
+`/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next`
143
+instead.
144
+
145
To prevent a $GIT_DIR/worktrees entry from being pruned (which
146
can be useful in some situations, such as when the
147
entry's working tree is stored on a portable device), add a file named
setup.c
-12
@@ -401,17 +401,6 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
401
return ret;
402
}
403
404
-static void update_linked_gitdir(const char *gitfile, const char *gitdir)
405
-{
406
- struct strbuf path = STRBUF_INIT;
407
- struct stat st;
408
-
409
- strbuf_addf(&path, "%s/gitdir", gitdir);
410
- if (stat(path.buf, &st) || st.st_mtime + 24 * 3600 < time(NULL))
411
- write_file(path.buf, "%s", gitfile);
412
- strbuf_release(&path);
413
-}
414
-
404
/*
405
* Try to read the location of the git directory from the .git file,
406
* return path to git directory if found.
@@ -481,7 +470,6 @@ const char *read_gitfile_gently(const char *path, int *return_error_code)
470
error_code = READ_GITFILE_ERR_NOT_A_REPO;
471
goto cleanup_return;
472
}
484
- update_linked_gitdir(path, dir);
473
path = real_path(dir);
474
475
cleanup_return: