diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-08-05 15:12:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-10 10:12:07 +0200 |
| commit | 7efeb8f09866ddd09485c0e6f371a6cbba3d2a0a (patch) | |
| tree | add9ba706a65a6e13b6b8da4776b8610ff5df019 /t/t1500-rev-parse.sh | |
| parent | tweak manpage formatting (diff) | |
| download | git-7efeb8f09866ddd09485c0e6f371a6cbba3d2a0a.tar.xz git-7efeb8f09866ddd09485c0e6f371a6cbba3d2a0a.zip | |
Reinstate the old behaviour when GIT_DIR is set and GIT_WORK_TREE is unset
The old behaviour was to unilaterally default to the cwd is the work tree
when GIT_DIR was set, but GIT_WORK_TREE wasn't, no matter if we are inside
the GIT_DIR, or if GIT_DIR is actually something like ../../../.git.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1500-rev-parse.sh')
| -rwxr-xr-x | t/t1500-rev-parse.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index bea40cba8d..e474b3f1d5 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -28,6 +28,8 @@ test_rev_parse() { [ $# -eq 0 ] && return } +# label is-bare is-inside-git is-inside-work prefix + test_rev_parse toplevel false false true '' cd .git || exit 1 @@ -53,13 +55,13 @@ export GIT_DIR=../.git export GIT_CONFIG="$(pwd)"/../.git/config git config core.bare false -test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false true work/ +test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false true '' git config core.bare true test_rev_parse 'GIT_DIR=../.git, core.bare = true' true false false '' git config --unset core.bare -test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true work/ +test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true '' mv ../.git ../repo.git || exit 1 export GIT_DIR=../repo.git |