From: Matthias Lederhofer Date: Sun, 03 Jun 2007 14:48:46 GMT Subject: [PATCH 6/7] extend rev-parse test for --is-inside-work-tree Message-ID: <20070603144846.GF20061@moooo.ath.cx> In-Reply-To: <20070603144401.GA9518@moooo.ath.cx> Signed-off-by: Matthias Lederhofer --- t/t1500-rev-parse.sh | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index a180309..44cb141 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -17,42 +17,47 @@ 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 -mv .git foo.git || exit 1 -export GIT_DIR=foo.git -export GIT_CONFIG=foo.git/config - -git config core.bare true -test_rev_parse 'GIT_DIR=foo.git, core.bare = true' true +mv .git repo.git || exit 1 +export GIT_DIR=repo.git +export GIT_CONFIG=repo.git/config git config core.bare false -test_rev_parse 'GIT_DIR=foo.git, core.bare = 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 false false git config --unset core.bare -test_rev_parse 'GIT_DIR=foo.git, core.bare undefined' true +test_rev_parse 'GIT_DIR=repo.git, core.bare undefined' true false false test_done -- 1.5.0.3