diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:56:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:56:51 -0800 |
| commit | fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4 (patch) | |
| tree | a3c4cf94132da5755e874ef44bd8072d679ba0c8 /t/t1500-rev-parse.sh | |
| parent | Merge branch 'jc/submittingpatches' (diff) | |
| parent | fix config reading in tests (diff) | |
| download | tgif-fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4.tar.xz | |
Merge branch 'jk/noetcconfig'
* jk/noetcconfig:
fix config reading in tests
allow suppressing of global and system config
Conflicts:
cache.h
Diffstat (limited to 't/t1500-rev-parse.sh')
| -rwxr-xr-x | t/t1500-rev-parse.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index e474b3f1d5..38a2bf09af 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -33,9 +33,9 @@ test_rev_parse() { test_rev_parse toplevel false false true '' cd .git || exit 1 -test_rev_parse .git/ true true false '' +test_rev_parse .git/ false true false '' cd objects || exit 1 -test_rev_parse .git/objects/ true true false '' +test_rev_parse .git/objects/ false true false '' cd ../.. || exit 1 mkdir -p sub/dir || exit 1 |