diff options
| author | Alexander Strasser <eclipse7@gmx.net> | 2012-07-12 00:12:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-11 15:36:14 -0700 |
| commit | 1358bb496fb182d8047a039f09c3859364cea2b4 (patch) | |
| tree | 886ef98e769f55c1d0f448222ab5b89ceb8b79ee /t/t4012-diff-binary.sh | |
| parent | 8d141a1d562abb31f27f599dbf6e10a6c06ed73e (diff) | |
| download | git-1358bb496fb182d8047a039f09c3859364cea2b4.tar.gz git-1358bb496fb182d8047a039f09c3859364cea2b4.tar.xz | |
t4012: modernize style for quoting
This quoting style is used by all newly added test code.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4012-diff-binary.sh')
| -rwxr-xr-x | t/t4012-diff-binary.sh | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 6cebb3951..2a8b68ef4 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -15,13 +15,14 @@ cat >expect.binary-numstat <<\EOF - - d EOF -test_expect_success 'prepare repository' \ - 'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && +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' + cat b b >d +' cat > expected <<\EOF a | 2 +- @@ -62,8 +63,8 @@ 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 | sed -e 's/-CIT/xCIT/' >broken && +test_expect_success 'apply detecting corrupt patch correctly' ' + git diff | sed -e 's/-CIT/xCIT/' >broken && if git apply --stat --summary broken 2>detected then echo unhappy - should have detected an error @@ -74,10 +75,11 @@ test_expect_success 'apply detecting corrupt patch correctly' \ detected=`cat detected` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=`sed -ne "${detected}p" broken` && - test "$detected" = xCIT' + test "$detected" = xCIT +' -test_expect_success 'apply detecting corrupt patch correctly' \ - 'git diff --binary | sed -e 's/-CIT/xCIT/' >broken && +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 echo unhappy - should have detected an error @@ -88,23 +90,26 @@ test_expect_success 'apply detecting corrupt patch correctly' \ detected=`cat detected` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=`sed -ne "${detected}p" broken` && - test "$detected" = xCIT' + 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 && +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' + git apply --stat --summary current +' -test_expect_success 'apply binary patch' \ - 'git reset --hard && +test_expect_success 'apply binary patch' ' + git reset --hard && git apply --binary --index <current && tree1=`git write-tree` && - test "$tree1" = "$tree0"' + test "$tree1" = "$tree0" +' test_expect_success 'diff --no-index with binary creation' ' echo Q | q_to_nul >binary && |