mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

t0108: modernize style

Browse Source 
* &&-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>
This commit is contained in:
John Keeping 2014-12-28 13:10:32 +00:00 committed by Jason A. Donenfeld
parent b122730014
commit ce8f490229
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/t0108-patch.sh
View File

@ -24,10 +24,10 @@ test_expect_success 'find `cgit` signature' '
' '
test_expect_success 'compare with output of git-format-patch(1)' ' test_expect_success 'compare with output of git-format-patch(1)' '
CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) 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 git --git-dir="$PWD/repos/foo/.git" format-patch -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 &&
sed "1,5d" tmp >tmp_ strip_headers <tmp >tmp_ &&
cmp tmp_ tmp2 test_cmp tmp_ tmp2
' '
test_expect_success 'find initial commit' ' test_expect_success 'find initial commit' '
@ -43,8 +43,8 @@ test_expect_success 'find `cgit` signature' '
' '
test_expect_success 'generate patches for multiple commits' ' test_expect_success 'generate patches for multiple commits' '
id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&
id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) &&
cgit_query "url=foo/patch&id=$id&id2=$id2" >tmp 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)' ' test_expect_success 'compare with output of git-format-patch(1)' '
CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) 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 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_ strip_headers <tmp >tmp_ &&
cmp tmp_ tmp2 test_cmp tmp_ tmp2
' '
test_done test_done