Merge branch 'mm/reset-facl-before-umask-test'

diff --git a/worktree.c b/worktree.c
index 53b4771c04a2b9de15379fdd213f20f213b1be60..d633761575bff4811fa4f3f3822807b1f77f5ecb 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -145,7 +145,7 @@ static struct worktree *get_linked_worktree(const char *id)
 
 static void mark_current_worktree(struct worktree **worktrees)
 {
-       char *git_dir = xstrdup(absolute_path(get_git_dir()));
+       char *git_dir = absolute_pathdup(get_git_dir());
        int i;
 
        for (i = 0; worktrees[i]; i++) {