From: Alexander Strasser <eclipse7@gmx.net>
To: git@vger.kernel.org
Cc: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>,
"Junio C Hamano" <gitster@pobox.com>,
"Johannes Sixt" <j6t@kdbg.org>
Subject: [PATCH v2 1/8] t4012: modernize style for quoting
Date: Mon, 16 Jul 2012 22:43:18 +0200 [thread overview]
Message-ID: <0139a133d8c46a149e0456976a447a7f271d5104.1342468069.git.eclipse7@gmx.net> (raw)
In-Reply-To: <cover.1342468069.git.eclipse7@gmx.net>
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>
---
t/t4012-diff-binary.sh | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 6cebb39..2a8b68e 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 &&
--
1.7.10.2.552.gaa3bb87
next prev parent reply other threads:[~2012-07-16 20:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 22:11 [PATCH 0/6] Cleaning up t4012 Alexander Strasser
2012-07-12 7:13 ` [PATCH 7/6?] t4012: use 'printf' instead of 'dd' to generate a binary file Johannes Sixt
2012-07-12 22:25 ` Alexander Strasser
2012-07-16 20:40 ` [PATCH v2 0/8] Cleaning up t4012 Alexander Strasser
2012-07-16 20:43 ` Alexander Strasser [this message]
2012-07-16 20:43 ` [PATCH v2 2/8] t4012: Unquote git command fragment in test title Alexander Strasser
2012-07-16 20:43 ` [PATCH v2 3/8] t4012: Actually quote the sed script Alexander Strasser
2012-07-16 20:44 ` [PATCH v2 4/8] t4012: Break up pipe into serial redirections Alexander Strasser
2012-07-16 20:45 ` [PATCH v2 5/8] t4012: Make --shortstat test more robust Alexander Strasser
2012-07-16 20:45 ` [PATCH v2 6/8] t4012: Re-indent test snippets Alexander Strasser
2012-07-16 20:46 ` [PATCH v2 7/8] t4012: use 'printf' instead of 'dd' to generate a binary file Alexander Strasser
2012-07-16 20:47 ` [PATCH v2 8/8] t4012: Use test_must_fail instead of if-else Alexander Strasser
2012-07-16 21:11 ` [PATCH v2 0/8] Cleaning up t4012 Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0139a133d8c46a149e0456976a447a7f271d5104.1342468069.git.eclipse7@gmx.net \
--to=eclipse7@gmx.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=zbyszek@in.waw.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).