diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-10-16 23:37:36 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-17 00:18:04 (GMT) |
| commit | dd5c8af176bb935a0b01a7dc2d5e022565c3aac3 (patch) | |
| tree | 7bcd6b5db31c7b9317240b2f904d92df8437bbc1 /t | |
| parent | 33c8d38c7879ee9af0365481eecb4b3906da111a (diff) | |
| download | git-dd5c8af176bb935a0b01a7dc2d5e022565c3aac3.zip git-dd5c8af176bb935a0b01a7dc2d5e022565c3aac3.tar.gz git-dd5c8af176bb935a0b01a7dc2d5e022565c3aac3.tar.bz2 | |
Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
There are a few programs, such as config and diff, which allow running
without a git repository. Therefore, they have to call
setup_git_directory_gently().
However, when GIT_DIR and GIT_WORK_TREE were set, and the current
directory was a subdirectory of the work tree,
setup_git_directory_gently() would return a bogus NULL prefix.
This patch fixes that.
Noticed by REPLeffect on IRC.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1501-worktree.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 7322161..7ee3820 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -103,4 +103,13 @@ test_expect_success 'repo finds its work tree from work tree, too' ' test sub/dir/tracked = "$(git ls-files)") ' +test_expect_success '_gently() groks relative GIT_DIR & GIT_WORK_TREE' ' + cd repo.git/work/sub/dir && + GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \ + git diff --exit-code tracked && + echo changed > tracked && + ! GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \ + git diff --exit-code tracked +' + test_done |