| commit | 8fc0ae80f6938e409e0efa45d6d504c6137744e3 | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Sat, 24 Jul 2010 11:29:41 +0000 (24 06:29 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Aug 2010 18:21:44 +0000 (4 11:21 -0700) | ||
| tree | 8c14726e50b890226775492d29acb57a4398ece3 | treesnapshot (tar.gz zip) |
| parent | 60f20d4bb4f56ae90967d810ffb042e9f76b310d | commitdiff |
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>
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>
| setup.c | diffblobblamehistory | |
| t/t4111-apply-subdir.sh | diffblobblamehistory |