diff options
| author | Jason A. Donenfeld | 2015-08-12 15:15:56 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld | 2015-08-12 15:16:05 +0200 |
| commit | 2d386e227e0b75474efcfe82e9fec7d0f21c6df4 (patch) | |
| tree | 7c42b308cc67ced289d96501cc93abbccdcf908c | |
| parent | about: always ensure page has a trailing slash (diff) | |
| download | cgit-2d386e227e0b75474efcfe82e9fec7d0f21c6df4.tar.gz cgit-2d386e227e0b75474efcfe82e9fec7d0f21c6df4.zip | |
t0110: Chain together using &&
| -rwxr-xr-x | tests/t0110-rawdiff.sh | 16 |
1 files changed, 8 insertions, 8 deletions
| diff --git a/tests/t0110-rawdiff.sh b/tests/t0110-rawdiff.sh index 500e68c..66fa7d5 100755 --- a/tests/t0110-rawdiff.sh +++ b/tests/t0110-rawdiff.sh | |||
| @@ -8,8 +8,8 @@ test_expect_success 'generate foo/rawdiff' ' | |||
| 8 | ' | 8 | ' |
| 9 | 9 | ||
| 10 | test_expect_success 'compare with output of git-diff(1)' ' | 10 | test_expect_success 'compare with output of git-diff(1)' ' |
| 11 | git --git-dir="$PWD/repos/foo/.git" diff HEAD^.. >tmp2 | 11 | git --git-dir="$PWD/repos/foo/.git" diff HEAD^.. >tmp2 && |
| 12 | sed "1,4d" tmp >tmp_ | 12 | sed "1,4d" tmp >tmp_ && |
| 13 | cmp tmp_ tmp2 | 13 | cmp tmp_ tmp2 |
| 14 | ' | 14 | ' |
| 15 | 15 | ||
| @@ -22,20 +22,20 @@ test_expect_success 'generate diff for initial commit' ' | |||
| 22 | ' | 22 | ' |
| 23 | 23 | ||
| 24 | test_expect_success 'compare with output of git-diff-tree(1)' ' | 24 | test_expect_success 'compare with output of git-diff-tree(1)' ' |
| 25 | git --git-dir="$PWD/repos/foo/.git" diff-tree -p --no-commit-id --root "$root" >tmp2 | 25 | git --git-dir="$PWD/repos/foo/.git" diff-tree -p --no-commit-id --root "$root" >tmp2 && |
| 26 | sed "1,4d" tmp >tmp_ | 26 | sed "1,4d" tmp >tmp_ && |
| 27 | cmp tmp_ tmp2 | 27 | cmp tmp_ tmp2 |
| 28 | ' | 28 | ' |
| 29 | 29 | ||
| 30 | test_expect_success 'generate diff for multiple commits' ' | 30 | test_expect_success 'generate diff for multiple commits' ' |
| 31 | id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) | 31 | id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) && |
| 32 | id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) | 32 | id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) && |
| 33 | cgit_query "url=foo/rawdiff&id=$id&id2=$id2" >tmp | 33 | cgit_query "url=foo/rawdiff&id=$id&id2=$id2" >tmp |
| 34 | ' | 34 | ' |
| 35 | 35 | ||
| 36 | test_expect_success 'compare with output of git-diff(1)' ' | 36 | test_expect_success 'compare with output of git-diff(1)' ' |
| 37 | git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD >tmp2 | 37 | git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD >tmp2 && |
| 38 | sed "1,4d" tmp >tmp_ | 38 | sed "1,4d" tmp >tmp_ && |
| 39 | cmp tmp_ tmp2 | 39 | cmp tmp_ tmp2 |
| 40 | ' | 40 | ' |
| 41 | 41 | ||