setup_git_directory(): fix move to worktree toplevel directory
When setup_git_directory() returns successfully, it is supposed to move current working directory to worktree toplevel directory. However, the code recomputing prefix inside setup_git_directory() has to move cwd back to original working directory, in order to get new prefix. After that, it should move cwd back to worktree toplevel directory as expected. 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
Aug 30, 2008 at 16:15 UTC
bb528633b34ac9c338a7761f3e1d251e0c560ed6
1 file changed
+2
setup.c
+2
@@ -581,6 +581,8 @@ const char *setup_git_directory(void)
581
if (retval && chdir(retval))
582
die ("Could not jump back into original cwd");
583
rel = get_relative_cwd(buffer, PATH_MAX, get_git_work_tree());
584
+ if (rel && *rel && chdir(get_git_work_tree()))
585
+ die ("Could not jump to working directory");
586
return rel && *rel ? strcat(rel, "/") : NULL;
587
}
588