setup_git_directory(): fix move to worktree toplevel directory

pclouds · gitster · commit bb528633b34a · 2008-08-30T23:41:12.000-07:00
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 &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/setup.c b/setup.c
@@ -581,6 +581,8 @@ const char *setup_git_directory(void)
 		if (retval && chdir(retval))
 			die ("Could not jump back into original cwd");
 		rel = get_relative_cwd(buffer, PATH_MAX, get_git_work_tree());
+		if (rel && *rel && chdir(get_git_work_tree()))
+			die ("Could not jump to working directory");
 		return rel && *rel ? strcat(rel, "/") : NULL;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,8 @@ const char *setup_git_directory(void)`
`581`	`581`	`if (retval && chdir(retval))`
`582`	`582`	`die ("Could not jump back into original cwd");`
`583`	`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");`
`584`	`586`	`return rel && *rel ? strcat(rel, "/") : NULL;`
`585`	`587`	`}`
`586`	`588`