diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2009-02-14 17:16:28 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-14 21:29:46 -0800 |
| commit | 8fb3c00d2ea4dad96fe977f8983ba0376e0c4986 (patch) | |
| tree | f18414d7f7794cac50a4ade3d6f62151cc2d6f67 | |
| parent | d0268de6d755c72ff375ec95a0cc0dbd99dc31e2 (diff) | |
| download | git-8fb3c00d2ea4dad96fe977f8983ba0376e0c4986.tar.gz git-8fb3c00d2ea4dad96fe977f8983ba0376e0c4986.tar.xz | |
Move 'rev-parse --git-dir' test to t1500
Commit 72183cb2 (Fix gitdir detection when in subdir of
gitdir, 2009-01-16) added a test to 't1501-worktree' to check the
behaviour of 'git rev-parse --git-dir' in a special case. However,
t1501 is about testing separate work tree setups, and not about basic
'rev-parse' functionality, which is tested in t1500-rev-parse.
Therefore, this patch moves that test to t1500.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t1500-rev-parse.sh | 11 | ||||
| -rwxr-xr-x | t/t1501-worktree.sh | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index 85da4caa7..186792e3a 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -26,16 +26,23 @@ test_rev_parse() { "test '$1' = \"\$(git rev-parse --show-prefix)\"" shift [ $# -eq 0 ] && return + + test_expect_success "$name: git-dir" \ + "test '$1' = \"\$(git rev-parse --git-dir)\"" + shift + [ $# -eq 0 ] && return } -# label is-bare is-inside-git is-inside-work prefix +# label is-bare is-inside-git is-inside-work prefix git-dir + +ROOT=$(pwd) test_rev_parse toplevel false false true '' cd .git || exit 1 test_rev_parse .git/ false true false '' cd objects || exit 1 -test_rev_parse .git/objects/ false true false '' +test_rev_parse .git/objects/ false true false '' "$ROOT/.git" cd ../.. || exit 1 mkdir -p sub/dir || exit 1 diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 27dc6c55d..f6a6f839a 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -92,13 +92,6 @@ cd sub/dir || exit 1 test_rev_parse 'in repo.git/sub/dir' false true true sub/dir/ cd ../../../.. || exit 1 -test_expect_success 'detecting gitdir when cwd is in a subdir of gitdir' ' - (expected=$(pwd)/repo.git && - cd repo.git/refs && - unset GIT_DIR && - test "$expected" = "$(git rev-parse --git-dir)") -' - test_expect_success 'repo finds its work tree' ' (cd repo.git && : > work/sub/dir/untracked && |