From: Matthias Lederhofer Date: Wed, 6 Jun 2007 07:13:26 +0000 (+0200) Subject: extend rev-parse test for --is-inside-work-tree X-Git-Tag: v1.5.3-rc0~29^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6c56049ff6b0f59df8a2e23bc83e10c50d9d0218;p=git.git extend rev-parse test for --is-inside-work-tree Signed-off-by: Matthias Lederhofer Signed-off-by: Junio C Hamano --- diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index 66b0e581c..ec4996637 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -17,30 +17,35 @@ test_rev_parse() { shift [ $# -eq 0 ] && return + test_expect_success "$name: is-inside-work-tree" \ + "test '$1' = \"\$(git rev-parse --is-inside-work-tree)\"" + shift + [ $# -eq 0 ] && return + test_expect_success "$name: prefix" \ "test '$1' = \"\$(git rev-parse --show-prefix)\"" shift [ $# -eq 0 ] && return } -test_rev_parse toplevel false false '' +test_rev_parse toplevel false false true '' cd .git || exit 1 -test_rev_parse .git/ false true .git/ +test_rev_parse .git/ false true true .git/ cd objects || exit 1 -test_rev_parse .git/objects/ false true .git/objects/ +test_rev_parse .git/objects/ false true true .git/objects/ cd ../.. || exit 1 mkdir -p sub/dir || exit 1 cd sub/dir || exit 1 -test_rev_parse subdirectory false false sub/dir/ +test_rev_parse subdirectory false false true sub/dir/ cd ../.. || exit 1 git config core.bare true -test_rev_parse 'core.bare = true' true +test_rev_parse 'core.bare = true' true false true git config --unset core.bare -test_rev_parse 'core.bare undefined' false +test_rev_parse 'core.bare undefined' false false true mkdir work || exit 1 cd work || exit 1 @@ -48,25 +53,25 @@ export GIT_DIR=../.git export GIT_CONFIG="$GIT_DIR"/config git config core.bare false -test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false '' +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 +test_rev_parse 'GIT_DIR=../.git, core.bare = true' true false true '' git config --unset core.bare -test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false '' +test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true '' mv ../.git ../repo.git || exit 1 export GIT_DIR=../repo.git export GIT_CONFIG="$GIT_DIR"/config git config core.bare false -test_rev_parse 'GIT_DIR=../repo.git, core.bare = false' false false '' +test_rev_parse 'GIT_DIR=../repo.git, core.bare = false' false false true '' git config core.bare true -test_rev_parse 'GIT_DIR=../repo.git, core.bare = true' true +test_rev_parse 'GIT_DIR=../repo.git, core.bare = true' true false true '' git config --unset core.bare -test_rev_parse 'GIT_DIR=../repo.git, core.bare undefined' true +test_rev_parse 'GIT_DIR=../repo.git, core.bare undefined' true false true '' test_done