From 2d386e227e0b75474efcfe82e9fec7d0f21c6df4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 12 Aug 2015 15:15:56 +0200 Subject: t0110: Chain together using && --- tests/t0110-rawdiff.sh | 16 ++++++++-------- 1 file 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 ' -- cgit 1.4.1 ' action='/cgit-pink/log/tests/t0104-tree.sh'>
path: root/tests/t0104-tree.sh (unfollow)
Commit message (Expand)Author
2013-05-25git: update to 1.8.3John Keeping
2013-05-22cache.c: cache ls_cache output properlyJohn Keeping
2013-05-22tests: introduce strip_header() helper functionJohn Keeping
2013-05-22shared.c: use die_errno() where appropriateJohn Keeping
2013-05-22html.c: die when write failsJohn Keeping
2013-05-22ui-log: add <span/> around commit decorationsJohn Keeping
2013-05-22Makefile: fix parallel "make test"John Keeping
2013-05-18cache.c: fix cache_lsJohn Keeping
2013-05-13t0109: "function" is a bash-ismJohn Keeping
2013-05-13New mailing list.Jason A. Donenfeld
2013-04-30ui-snapshot: do not access $HOMEJason A. Donenfeld
2013-04-27t0001: validate Git -rcN version numbers correctlyJohn Keeping
2013-04-27git: update to 1.8.2.2John Keeping
2013-04-17scan-tree: fix regression in section-from-path=-1John Keeping
2013-04-15t0001: ignore ".dirty" suffix on Git versionJohn Keeping
2013-04-15tests: set TEST_OUTPUT_DIRECTORY to the CGit test directoryJohn Keeping
2013-04-15t0109: test more URLsJohn Keeping
2013-04-10cgitrc.5.txt: Specify when scan-path must be defined before.Jason A. Donenfeld
2013-04-10ui-snapshot.c: Prepend "V" when guessing ref namesLukas Fleischer
2013-04-10t0107: Skip ZIP tests if unzip(1) isn't availableLukas Fleischer
2013-04-10tests/: Do not use `sed -i`Lukas Fleischer
2013-04-10Add branch-sort and repo.branch-sort options.Jason A. Donenfeld
2013-04-10t0109: chain operations with &&John Keeping
2013-04-10cgit.c: Do not restore unset environment variablesLukas Fleischer
2013-04-09t0107: Use `tar -z` for gzip'ed archivesLukas Fleischer