{"thread":{"id":"1102","subject":"[PATCH] Fixup t/t5300 unit tests broken by 5f3de58ff85c49620ae2a1722d8d4d37c881a054","startedAt":"2005-07-04T13:15:36Z","lastAt":"2005-07-04T13:15:36Z","messageCount":1,"participants":["Jon Seymour"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"5627","messageId":"20050704131536.2214.qmail@blackcubes.dyndns.org","threadId":"1102","inReplyTo":null,"subject":"[PATCH] Fixup t/t5300 unit tests broken by 5f3de58ff85c49620ae2a1722d8d4d37c881a054","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2005-07-04T13:15:36Z","receivedAt":"2005-07-04T13:15:36Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"\nThis patch fixes up the t/t5300 unit tests which were broken by the changes in:\n\n\tMake the name of a pack-file depend on the objects packed there-in.\n\nSigned-off-by: Jon Seymour <jon.seymour@gmail.com>\n---\n\n t/t5300-pack-object.sh |   30 +++++++++++++++---------------\n 1 files changed, 15 insertions(+), 15 deletions(-)\n\n1bd90884e1a91e2f2e84898703c79cb9c8db0572\ndiff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh\n--- a/t/t5300-pack-object.sh\n+++ b/t/t5300-pack-object.sh\n@@ -35,18 +35,18 @@ test_expect_success \\\n \n test_expect_success \\\n     'pack without delta' \\\n-    'git-pack-objects --window=0 test-1 <obj-list'\n+    'packname_1=$(git-pack-objects --window=0 test-1 <obj-list)'\n \n rm -fr .git2\n mkdir .git2\n \n test_expect_success \\\n     'unpack without delta' \\\n-    'GIT_OBJECT_DIRECTORY=.git2/objects &&\n+    \"GIT_OBJECT_DIRECTORY=.git2/objects &&\n      export GIT_OBJECT_DIRECTORY &&\n      git-init-db &&\n-     git-unpack-objects -n <test-1.pack &&\n-     git-unpack-objects <test-1.pack'\n+     git-unpack-objects -n <test-1-${packname_1}.pack &&\n+     git-unpack-objects <test-1-${packname_1}.pack\"\n \n unset GIT_OBJECT_DIRECTORY\n cd $TRASH/.git2\n@@ -66,7 +66,7 @@ cd $TRASH\n test_expect_success \\\n     'pack with delta' \\\n     'pwd &&\n-     git-pack-objects test-2 <obj-list'\n+     packname_2=$(git-pack-objects test-2 <obj-list)'\n \n rm -fr .git2\n mkdir .git2\n@@ -76,8 +76,8 @@ test_expect_success \\\n     'GIT_OBJECT_DIRECTORY=.git2/objects &&\n      export GIT_OBJECT_DIRECTORY &&\n      git-init-db &&\n-     git-unpack-objects -n <test-2.pack &&\n-     git-unpack-objects <test-2.pack'\n+     git-unpack-objects -n <test-2-${packname_2}.pack &&\n+     git-unpack-objects <test-2-${packname_2}.pack'\n \n unset GIT_OBJECT_DIRECTORY\n cd $TRASH/.git2\n@@ -101,7 +101,7 @@ test_expect_success \\\n     'GIT_OBJECT_DIRECTORY=.git2/objects &&\n      export GIT_OBJECT_DIRECTORY &&\n      git-init-db &&\n-     cp test-1.pack test-1.idx .git2/objects/pack && {\n+     cp test-1-${packname_1}.pack test-1-${packname_1}.idx .git2/objects/pack && {\n \t git-diff-tree --root -p $commit &&\n \t while read object\n \t do\n@@ -117,7 +117,7 @@ test_expect_success \\\n     'GIT_OBJECT_DIRECTORY=.git2/objects &&\n      export GIT_OBJECT_DIRECTORY &&\n      rm -f .git2/objects/pack/test-?.idx &&\n-     cp test-2.pack test-2.idx .git2/objects/pack && {\n+     cp test-2-${packname_2}.pack test-2-${packname_2}.idx .git2/objects/pack && {\n \t git-diff-tree --root -p $commit &&\n \t while read object\n \t do\n@@ -131,32 +131,32 @@ unset GIT_OBJECT_DIRECTORY\n \n test_expect_success \\\n     'verify pack' \\\n-    'git-verify-pack test-1.idx test-2.idx'\n+    'git-verify-pack test-1-${packname_1}.idx test-2-${packname_2}.idx'\n \n test_expect_success \\\n     'corrupt a pack and see if verify catches' \\\n-    'cp test-1.idx test-3.idx &&\n-     cp test-2.pack test-3.pack &&\n+    'cp test-1-${packname_1}.idx test-3.idx &&\n+     cp test-2-${packname_2}.pack test-3.pack &&\n      if git-verify-pack test-3.idx\n      then false\n      else :;\n      fi &&\n \n-     cp test-1.pack test-3.pack &&\n+     cp test-1-${packname_1}.pack test-3.pack &&\n      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&\n      if git-verify-pack test-3.idx\n      then false\n      else :;\n      fi &&\n \n-     cp test-1.pack test-3.pack &&\n+     cp test-1-${packname_1}.pack test-3.pack &&\n      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&\n      if git-verify-pack test-3.idx\n      then false\n      else :;\n      fi &&\n \n-     cp test-1.pack test-3.pack &&\n+     cp test-1-${packname_1}.pack test-3.pack &&\n      dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&\n      if git-verify-pack test-3.idx\n      then false\n------------\n"}]}