mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
d0268de6d7
commit
8fb3c00d2e
|
@ -26,16 +26,23 @@ test_rev_parse() {
|
||||||
"test '$1' = \"\$(git rev-parse --show-prefix)\""
|
"test '$1' = \"\$(git rev-parse --show-prefix)\""
|
||||||
shift
|
shift
|
||||||
[ $# -eq 0 ] && return
|
[ $# -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 ''
|
test_rev_parse toplevel false false true ''
|
||||||
|
|
||||||
cd .git || exit 1
|
cd .git || exit 1
|
||||||
test_rev_parse .git/ false true false ''
|
test_rev_parse .git/ false true false ''
|
||||||
cd objects || exit 1
|
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
|
cd ../.. || exit 1
|
||||||
|
|
||||||
mkdir -p sub/dir || exit 1
|
mkdir -p sub/dir || exit 1
|
||||||
|
|
|
@ -92,13 +92,6 @@ cd sub/dir || exit 1
|
||||||
test_rev_parse 'in repo.git/sub/dir' false true true sub/dir/
|
test_rev_parse 'in repo.git/sub/dir' false true true sub/dir/
|
||||||
cd ../../../.. || exit 1
|
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' '
|
test_expect_success 'repo finds its work tree' '
|
||||||
(cd repo.git &&
|
(cd repo.git &&
|
||||||
: > work/sub/dir/untracked &&
|
: > work/sub/dir/untracked &&
|
||||||
|
|
Loading…
Reference in a new issue