From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 1/2] t0108: modernize style
Date: Sun, 28 Dec 2014 13:10:32 +0000 [thread overview]
Message-ID: <595d5e3f56908d798587796d65594921383b8b6f.1419772233.git.john@keeping.me.uk> (raw)
* &&-chaining
* use test_cmp instead of cmp
* use strip_headers instead of knowing how many lines there will be
Signed-off-by: John Keeping <john at keeping.me.uk>
---
tests/t0108-patch.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index fcc749d..4e8aba3 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -24,10 +24,10 @@ test_expect_success 'find `cgit` signature' '
'
test_expect_success 'compare with output of git-format-patch(1)' '
- CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION)
- git --git-dir="$PWD/repos/foo/.git" format-patch -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2
- sed "1,5d" tmp >tmp_
- cmp tmp_ tmp2
+ CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
+ git --git-dir="$PWD/repos/foo/.git" format-patch -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 &&
+ strip_headers <tmp >tmp_ &&
+ test_cmp tmp_ tmp2
'
test_expect_success 'find initial commit' '
@@ -43,8 +43,8 @@ test_expect_success 'find `cgit` signature' '
'
test_expect_success 'generate patches for multiple commits' '
- id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD)
- id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3)
+ id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&
+ id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) &&
cgit_query "url=foo/patch&id=$id&id2=$id2" >tmp
'
@@ -53,10 +53,10 @@ test_expect_success 'find `cgit` signature' '
'
test_expect_success 'compare with output of git-format-patch(1)' '
- CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION)
- git --git-dir="$PWD/repos/foo/.git" format-patch -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2
- sed "1,5d" tmp >tmp_
- cmp tmp_ tmp2
+ CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
+ git --git-dir="$PWD/repos/foo/.git" format-patch -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 &&
+ strip_headers <tmp >tmp_ &&
+ test_cmp tmp_ tmp2
'
test_done
--
2.2.1.286.gdf3164c
next reply other threads:[~2014-12-28 13:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-28 13:10 john [this message]
2014-12-28 13:10 ` [PATCH 2/2] ui-patch: match git-format-patch(1) output john
2014-12-28 13:44 ` Jason
2014-12-28 13:43 ` [PATCH 1/2] t0108: modernize style Jason
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=595d5e3f56908d798587796d65594921383b8b6f.1419772233.git.john@keeping.me.uk \
--to=cgit@lists.zx2c4.com \
/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).