diff options
| author | John Keeping | 2014-12-28 13:10:32 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld | 2014-12-28 14:43:51 +0100 |
| commit | ce8f4902295fbc774454362600007c971770631a (patch) | |
| tree | 107bb45e674f557627d015d04a70b54a64b3bb44 /tests | |
| parent | Revert "git: use xz compressed archive for download" (diff) | |
| download | cgit-ce8f4902295fbc774454362600007c971770631a.tar.gz cgit-ce8f4902295fbc774454362600007c971770631a.zip | |
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>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/t0108-patch.sh | 20 |
1 files 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' ' | |||
| 24 | ' | 24 | ' |
| 25 | 25 | ||
| 26 | test_expect_success 'compare with output of git-format-patch(1)' ' | 26 | test_expect_success 'compare with output of git-format-patch(1)' ' |
| 27 | CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) | 27 | CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) && |
| 28 | git --git-dir="$PWD/repos/foo/.git" format-patch -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 | 28 | git --git-dir="$PWD/repos/foo/.git" format-patch -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 && |
| 29 | sed "1,5d" tmp >tmp_ | 29 | strip_headers <tmp >tmp_ && |
| 30 | cmp tmp_ tmp2 | 30 | test_cmp tmp_ tmp2 |
| 31 | ' | 31 | ' |
| 32 | 32 | ||
| 33 | test_expect_success 'find initial commit' ' | 33 | test_expect_success 'find initial commit' ' |
| @@ -43,8 +43,8 @@ test_expect_success 'find `cgit` signature' ' | |||
| 43 | ' | 43 | ' |
| 44 | 44 | ||
| 45 | test_expect_success 'generate patches for multiple commits' ' | 45 | test_expect_success 'generate patches for multiple commits' ' |
| 46 | id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) | 46 | id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) && |
| 47 | id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) | 47 | id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) && |
| 48 | cgit_query "url=foo/patch&id=$id&id2=$id2" >tmp | 48 | cgit_query "url=foo/patch&id=$id&id2=$id2" >tmp |
| 49 | ' | 49 | ' |
| 50 | 50 | ||
| @@ -53,10 +53,10 @@ test_expect_success 'find `cgit` signature' ' | |||
| 53 | ' | 53 | ' |
| 54 | 54 | ||
| 55 | test_expect_success 'compare with output of git-format-patch(1)' ' | 55 | test_expect_success 'compare with output of git-format-patch(1)' ' |
| 56 | CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) | 56 | CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) && |
| 57 | git --git-dir="$PWD/repos/foo/.git" format-patch -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 | 57 | git --git-dir="$PWD/repos/foo/.git" format-patch -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 && |
| 58 | sed "1,5d" tmp >tmp_ | 58 | strip_headers <tmp >tmp_ && |
| 59 | cmp tmp_ tmp2 | 59 | test_cmp tmp_ tmp2 |
| 60 | ' | 60 | ' |
| 61 | 61 | ||
| 62 | test_done | 62 | test_done |