aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2015-08-12 15:15:56 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2015-08-12 15:16:05 +0200
commit2d386e227e0b75474efcfe82e9fec7d0f21c6df4 (patch)
tree7c42b308cc67ced289d96501cc93abbccdcf908c
parentd7034806a4b1279f62d606501f831dcad31798e6 (diff)
downloadcgit-2d386e227e0b75474efcfe82e9fec7d0f21c6df4.tar.gz
cgit-2d386e227e0b75474efcfe82e9fec7d0f21c6df4.tar.xz
t0110: Chain together using &&
-rwxr-xr-xtests/t0110-rawdiff.sh16
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' '
'
test_expect_success 'compare with output of git-diff(1)' '
- git --git-dir="$PWD/repos/foo/.git" diff HEAD^.. >tmp2
- sed "1,4d" tmp >tmp_
+ git --git-dir="$PWD/repos/foo/.git" diff HEAD^.. >tmp2 &&
+ sed "1,4d" tmp >tmp_ &&
cmp tmp_ tmp2
'
@@ -22,20 +22,20 @@ test_expect_success 'generate diff for initial commit' '
'
test_expect_success 'compare with output of git-diff-tree(1)' '
- git --git-dir="$PWD/repos/foo/.git" diff-tree -p --no-commit-id --root "$root" >tmp2
- sed "1,4d" tmp >tmp_
+ git --git-dir="$PWD/repos/foo/.git" diff-tree -p --no-commit-id --root "$root" >tmp2 &&
+ sed "1,4d" tmp >tmp_ &&
cmp tmp_ tmp2
'
test_expect_success 'generate diff 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/rawdiff&id=$id&id2=$id2" >tmp
'
test_expect_success 'compare with output of git-diff(1)' '
- git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD >tmp2
- sed "1,4d" tmp >tmp_
+ git --git-dir="$PWD/repos/foo/.git" diff HEAD~3..HEAD >tmp2 &&
+ sed "1,4d" tmp >tmp_ &&
cmp tmp_ tmp2
'