mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree: prune linked worktree referencing main worktree path

Browse Source 
"git worktree prune" detects when multiple entries are associated with
the same path and prunes the duplicates, however, it does not detect
when a linked worktree points at the path of the main worktree.
Although "git worktree add" disallows creating a new worktree with the
same path as the main worktree, such a case can arise outside the
control of Git even without the user mucking with .git/worktree/<id>/
administrative files. For instance:

    $ git clone foo.git
    $ git -C foo worktree add ../bar
    $ rm -rf bar
    $ mv foo bar
    $ git -C bar worktree list
    .../bar deadfeeb [master]
    .../bar deadfeeb [bar]

Help the user recover from such corruption by extending "git worktree
prune" to also detect when a linked worktree is associated with the path
of the main worktree.

Reported-by: Jonathan Müller <jonathanmueller.dev@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine
2020-06-10 02:30:47 -04:00
committed by Junio C Hamano
parent 4a3ce479ce
commit 916133ef8e
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/worktree.c
View File

@ -156,6 +156,16 @@ static int prune_cmp(const void *a, const void *b)
if ((c = fspathcmp(x->string, y->string))) if ((c = fspathcmp(x->string, y->string)))
return c; return c;
/*
* paths same; prune_dupes() removes all but the first worktree entry
* having the same path, so sort main worktree ('util' is NULL) above
* linked worktrees ('util' not NULL) since main worktree can't be
* removed
*/
if (!x->util)
return -1;
if (!y->util)
return 1;
/* paths same; sort by .git/worktrees/<id> */ /* paths same; sort by .git/worktrees/<id> */
return strcmp(x->util, y->util); return strcmp(x->util, y->util);
} }
@ -174,6 +184,7 @@ static void prune_dups(struct string_list *l)
static void prune_worktrees(void) static void prune_worktrees(void)
{ {
struct strbuf reason = STRBUF_INIT; struct strbuf reason = STRBUF_INIT;
struct strbuf main_path = STRBUF_INIT;
struct string_list kept = STRING_LIST_INIT_NODUP; struct string_list kept = STRING_LIST_INIT_NODUP;
DIR *dir = opendir(git_path("worktrees")); DIR *dir = opendir(git_path("worktrees"));
struct dirent *d; struct dirent *d;
@ -191,6 +202,10 @@ static void prune_worktrees(void)
} }
closedir(dir); closedir(dir);
strbuf_add_absolute_path(&main_path, get_git_common_dir());
/* massage main worktree absolute path to match 'gitdir' content */
strbuf_strip_suffix(&main_path, "/.");
string_list_append(&kept, strbuf_detach(&main_path, NULL));
prune_dups(&kept); prune_dups(&kept);
string_list_clear(&kept, 1); string_list_clear(&kept, 1);

12
t/t2401-worktree-prune.sh
View File

@ -104,4 +104,16 @@ test_expect_success 'prune duplicate (linked/linked)' '
! test -d .git/worktrees/w2 ! test -d .git/worktrees/w2
' '
test_expect_success 'prune duplicate (main/linked)' '
test_when_finished rm -fr repo wt &&
test_create_repo repo &&
test_commit -C repo x &&
git -C repo worktree add --detach ../wt &&
rm -fr wt &&
mv repo wt &&
git -C wt worktree prune --verbose >actual &&
test_i18ngrep "duplicate entry" actual &&
! test -d .git/worktrees/wt
'
test_done test_done