{"thread":{"id":"31003","subject":"[PATCH 5/6] t4012: Re-indent test snippets","startedAt":"2012-07-11T22:13:11Z","lastAt":"2012-07-11T22:13:11Z","messageCount":1,"participants":["Alexander Strasser"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"194944","messageId":"20120711221311.GA21368@akuma","threadId":"31003","inReplyTo":null,"subject":"[PATCH 5/6] t4012: Re-indent test snippets","fromName":"Alexander Strasser","fromEmail":"eclipse7@gmx.net","sentAt":"2012-07-11T22:13:11Z","receivedAt":"2012-07-11T22:13:11Z","isPatch":true,"sender":{"key":"eclipse7@gmx.net","avatar":"https://avatars.githubusercontent.com/u/4342576?v=4"},"body":"Most one-level indents were 1 HT (horizontal tab) followed by 1 SP.\nRemove the SP.\n\nSigned-off-by: Alexander Strasser <eclipse7@gmx.net>\n---\n t/t4012-diff-binary.sh | 68 +++++++++++++++++++++++++-------------------------\n 1 file changed, 34 insertions(+), 34 deletions(-)\n\ndiff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh\nindex daf8234..81a9e8c 100755\n--- a/t/t4012-diff-binary.sh\n+++ b/t/t4012-diff-binary.sh\n@@ -16,12 +16,12 @@ cat >expect.binary-numstat <<\\EOF\n EOF\n \n test_expect_success 'prepare repository' '\n-\t echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&\n-\t git update-index --add a b c d &&\n-\t echo git >a &&\n-\t cat \"$TEST_DIRECTORY\"/test-binary-1.png >b &&\n-\t echo git >c &&\n-\t cat b b >d\n+\techo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&\n+\tgit update-index --add a b c d &&\n+\techo git >a &&\n+\tcat \"$TEST_DIRECTORY\"/test-binary-1.png >b &&\n+\techo git >c &&\n+\tcat b b >d\n '\n \n cat > expected <<\\EOF\n@@ -64,52 +64,52 @@ test_expect_success 'apply --numstat understands diff --binary format' '\n # apply needs to be able to skip the binary material correctly\n # in order to report the line number of a corrupt patch.\n test_expect_success 'apply detecting corrupt patch correctly' '\n-\t git diff >output &&\n-\t sed -e \"s/-CIT/xCIT/\" <output >broken &&\n-\t if git apply --stat --summary broken 2>detected\n-\t then\n+\tgit diff >output &&\n+\tsed -e \"s/-CIT/xCIT/\" <output >broken &&\n+\tif git apply --stat --summary broken 2>detected\n+\tthen\n \t\techo unhappy - should have detected an error\n \t\t(exit 1)\n-\t else\n+\telse\n \t\techo happy\n-\t fi &&\n-\t detected=`cat detected` &&\n-\t detected=`expr \"$detected\" : \"fatal.*at line \\\\([0-9]*\\\\)\\$\"` &&\n-\t detected=`sed -ne \"${detected}p\" broken` &&\n-\t test \"$detected\" = xCIT\n+\tfi &&\n+\tdetected=`cat detected` &&\n+\tdetected=`expr \"$detected\" : \"fatal.*at line \\\\([0-9]*\\\\)\\$\"` &&\n+\tdetected=`sed -ne \"${detected}p\" broken` &&\n+\ttest \"$detected\" = xCIT\n '\n \n test_expect_success 'apply detecting corrupt patch correctly' '\n-\t git diff --binary | sed -e \"s/-CIT/xCIT/\" >broken &&\n-\t if git apply --stat --summary broken 2>detected\n-\t then\n+\tgit diff --binary | sed -e \"s/-CIT/xCIT/\" >broken &&\n+\tif git apply --stat --summary broken 2>detected\n+\tthen\n \t\techo unhappy - should have detected an error\n \t\t(exit 1)\n-\t else\n+\telse\n \t\techo happy\n-\t fi &&\n-\t detected=`cat detected` &&\n-\t detected=`expr \"$detected\" : \"fatal.*at line \\\\([0-9]*\\\\)\\$\"` &&\n-\t detected=`sed -ne \"${detected}p\" broken` &&\n-\t test \"$detected\" = xCIT\n+\tfi &&\n+\tdetected=`cat detected` &&\n+\tdetected=`expr \"$detected\" : \"fatal.*at line \\\\([0-9]*\\\\)\\$\"` &&\n+\tdetected=`sed -ne \"${detected}p\" broken` &&\n+\ttest \"$detected\" = xCIT\n '\n \n test_expect_success 'initial commit' 'git commit -a -m initial'\n \n # Try removal (b), modification (d), and creation (e).\n test_expect_success 'diff-index with --binary' '\n-\t echo AIT >a && mv b e && echo CIT >c && cat e >d &&\n-\t git update-index --add --remove a b c d e &&\n-\t tree0=`git write-tree` &&\n-\t git diff --cached --binary >current &&\n-\t git apply --stat --summary current\n+\techo AIT >a && mv b e && echo CIT >c && cat e >d &&\n+\tgit update-index --add --remove a b c d e &&\n+\ttree0=`git write-tree` &&\n+\tgit diff --cached --binary >current &&\n+\tgit apply --stat --summary current\n '\n \n test_expect_success 'apply binary patch' '\n-\t git reset --hard &&\n-\t git apply --binary --index <current &&\n-\t tree1=`git write-tree` &&\n-\t test \"$tree1\" = \"$tree0\"\n+\tgit reset --hard &&\n+\tgit apply --binary --index <current &&\n+\ttree1=`git write-tree` &&\n+\ttest \"$tree1\" = \"$tree0\"\n '\n \n test_expect_success 'diff --no-index with binary creation' '\n-- \n1.7.10.2.552.gaa3bb87\n"}]}