summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-07-24 11:29:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-04 18:21:44 (GMT)
commit8fc0ae80f6938e409e0efa45d6d504c6137744e3 (patch)
tree8c14726e50b890226775492d29acb57a4398ece3 /setup.c
parent60f20d4bb4f56ae90967d810ffb042e9f76b310d (diff)
downloadgit-8fc0ae80f6938e409e0efa45d6d504c6137744e3.zip
git-8fc0ae80f6938e409e0efa45d6d504c6137744e3.tar.gz
git-8fc0ae80f6938e409e0efa45d6d504c6137744e3.tar.bz2
setup: do not forget working dir from subdir of gitdir
v1.6.1.3~4^2 (Fix gitdir detection when in subdir of gitdir, 2009-01-16) did not go far enough: when a git directory is an ancestor of the original working directory, not only should GIT_DIR be set to point to the .git directory, but the original working directory should be restored before carrying out the relevant command. This way, the effect of running a git command from a subdir of .git will be the same whether or not GIT_DIR is explicitly set. Noticed while investigating v1.6.0.3~1 (rehabilitate 'git index-pack' inside the object store, 2008-10-20). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/setup.c b/setup.c
index 5fb9c54..5734a1f 100644
--- a/setup.c
+++ b/setup.c
@@ -369,6 +369,8 @@ static const char *setup_bare_git_dir(const char *work_tree_env,
if (!work_tree_env)
inside_work_tree = 0;
if (offset != len) {
+ if (chdir(cwd))
+ die_errno("Cannot come back to cwd");
root_len = offset_1st_component(cwd);
cwd[offset > root_len ? offset : root_len] = '\0';
set_git_dir(cwd);