[PATCH] Adjust to git-init-db creating $GIT_OBJECT_DIRECTORY/pack
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Some tests expected the directory not to exist by default. Updated git-init-db prepares it properly so adjust tests to match that behaviour. Signed-off-by: Junio C Hamano <redacted> --- t/t0000-basic.sh | 6 +++--- t/t5300-pack-object.sh | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) de500ab0379e4db18d1511cbe91ace106eee7830
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh@@ -28,11 +28,11 @@ test_expect_success \ '.git/objects should be empty after git-init-db in an empty repo.' \ 'cmp -s /dev/null should-be-empty' -# also it should have 256 subdirectories. 257 is counting "objects" +# also it should have 257 subdirectories. 258 is counting "objects" find .git/objects -type d -print >full-of-directories test_expect_success \ - '.git/objects should have 256 subdirectories.' \ - 'test $(wc -l < full-of-directories) = 257' + '.git/objects should have 257 subdirectories.' \ + 'test $(wc -l < full-of-directories) = 258' ################################################################ # Basics of the basics
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh@@ -99,7 +99,6 @@ test_expect_success \ 'GIT_OBJECT_DIRECTORY=.git2/objects && export GIT_OBJECT_DIRECTORY && git-init-db && - mkdir .git2/objects/pack && cp test-1.pack test-1.idx .git2/objects/pack && { git-diff-tree --root -p $commit && while read object ------------