diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4012-diff-binary.sh | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 476776118..7b0e759c7 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -16,12 +16,12 @@ cat >expect.binary-numstat <<\EOF EOF test_expect_success 'prepare repository' ' - echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && - git update-index --add a b c d && - echo git >a && - cat "$TEST_DIRECTORY"/test-binary-1.png >b && - echo git >c && - cat b b >d + echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && + git update-index --add a b c d && + echo git >a && + cat "$TEST_DIRECTORY"/test-binary-1.png >b && + echo git >c && + cat b b >d ' cat > expected <<\EOF @@ -64,52 +64,52 @@ test_expect_success 'apply --numstat understands diff --binary format' ' # apply needs to be able to skip the binary material correctly # in order to report the line number of a corrupt patch. test_expect_success 'apply detecting corrupt patch correctly' ' - git diff >output && - sed -e "s/-CIT/xCIT/" <output >broken && - if git apply --stat --summary broken 2>detected - then + git diff >output && + sed -e "s/-CIT/xCIT/" <output >broken && + if git apply --stat --summary broken 2>detected + then echo unhappy - should have detected an error (exit 1) - else + else echo happy - fi && - detected=`cat detected` && - detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && - detected=`sed -ne "${detected}p" broken` && - test "$detected" = xCIT + fi && + detected=`cat detected` && + detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && + detected=`sed -ne "${detected}p" broken` && + test "$detected" = xCIT ' test_expect_success 'apply detecting corrupt patch correctly' ' - git diff --binary | sed -e "s/-CIT/xCIT/" >broken && - if git apply --stat --summary broken 2>detected - then + git diff --binary | sed -e "s/-CIT/xCIT/" >broken && + if git apply --stat --summary broken 2>detected + then echo unhappy - should have detected an error (exit 1) - else + else echo happy - fi && - detected=`cat detected` && - detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && - detected=`sed -ne "${detected}p" broken` && - test "$detected" = xCIT + fi && + detected=`cat detected` && + detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && + detected=`sed -ne "${detected}p" broken` && + test "$detected" = xCIT ' test_expect_success 'initial commit' 'git commit -a -m initial' # Try removal (b), modification (d), and creation (e). test_expect_success 'diff-index with --binary' ' - echo AIT >a && mv b e && echo CIT >c && cat e >d && - git update-index --add --remove a b c d e && - tree0=`git write-tree` && - git diff --cached --binary >current && - git apply --stat --summary current + echo AIT >a && mv b e && echo CIT >c && cat e >d && + git update-index --add --remove a b c d e && + tree0=`git write-tree` && + git diff --cached --binary >current && + git apply --stat --summary current ' test_expect_success 'apply binary patch' ' - git reset --hard && - git apply --binary --index <current && - tree1=`git write-tree` && - test "$tree1" = "$tree0" + git reset --hard && + git apply --binary --index <current && + tree1=`git write-tree` && + test "$tree1" = "$tree0" ' test_expect_success 'diff --no-index with binary creation' ' |