summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Lederhofer <matled@gmx.net>2007-06-06 07:13:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-06 23:07:53 (GMT)
commit6c56049ff6b0f59df8a2e23bc83e10c50d9d0218 (patch)
tree666b0af8204d7f4b0f590cb47bd32f5ddc8374d0
parent7ae3df8c0aa3b7337ae9ac7b6184ac05985bf996 (diff)
downloadgit-6c56049ff6b0f59df8a2e23bc83e10c50d9d0218.zip
git-6c56049ff6b0f59df8a2e23bc83e10c50d9d0218.tar.gz
git-6c56049ff6b0f59df8a2e23bc83e10c50d9d0218.tar.bz2
extend rev-parse test for --is-inside-work-tree
Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1500-rev-parse.sh29
1 files changed, 17 insertions, 12 deletions
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 66b0e58..ec49966 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