Author: John Keeping <john@keeping.me.uk>
t0108: modernize style * &&-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@keeping.me.uk>
tests/t0108-patch.sh | 20 ++++++++++----------
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh index fcc749df69c966b007e793c430631d1b0910fd06..4e8aba30fbff277ff3f9b2dc85d47e1e2af7e3ac 100755 --- a/tests/t0108-patch.sh +++ b/tests/t0108-patch.sh @@ -24,10 +24,10 @@ tail -2 tmp | head -1 | grep "^cgit" ' 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 @@ tail -2 tmp | head -1 | grep "^cgit" ' 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 @@ tail -2 tmp | head -1 | grep "^cgit" ' 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