kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
SZEDER Gábor 2009-02-14 17:16:28 +01:00 committed by Junio C Hamano
parent d0268de6d7
commit 8fb3c00d2e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/t1500-rev-parse.sh
View File

@ -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

7
t/t1501-worktree.sh
View File

@ -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 &&