[v4,27/27] t7700: stop losing return codes of git commands

Message ID	fb614f4385745c804aea36e0471dfc96c0b97cb9.1574731022.git.liu.denton@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=BbQ7=ZS=vger.kernel.org=git-owner@kernel.org> Date: Mon, 25 Nov 2019 17:18:48 -0800 From: Denton Liu <liu.denton@gmail.com> To: Git Mailing List <git@vger.kernel.org> Cc: Eric Sunshine <sunshine@sunshineco.com>, Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net> Subject: [PATCH v4 27/27] t7700: stop losing return codes of git commands Message-ID: <fb614f4385745c804aea36e0471dfc96c0b97cb9.1574731022.git.liu.denton@gmail.com> References: <cover.1574449072.git.liu.denton@gmail.com> <cover.1574731022.git.liu.denton@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <cover.1574731022.git.liu.denton@gmail.com> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: git-owner@vger.kernel.org Precedence: bulk
Series	t: test cleanup stemming from experimentally enabling pipefail \| expand [v4,00/27] t: test cleanup stemming from experimentally enabling pipefail [v4,01/27] lib-bash.sh: move `then` onto its own line [v4,02/27] apply-one-time-sed.sh: modernize style [v4,03/27] t0014: remove git command upstream of pipe [v4,04/27] t0090: stop losing return codes of git commands [v4,05/27] t3301: stop losing return codes of git commands [v4,06/27] t3600: use test_line_count() where possible [v4,07/27] t3600: stop losing return codes of git commands [v4,08/27] t3600: comment on inducing SIGPIPE in `git rm` [v4,09/27] t4015: stop losing return codes of git commands [v4,10/27] t4015: use test_write_lines() [v4,11/27] t4138: stop losing return codes of git commands [v4,12/27] t5317: stop losing return codes of git commands [v4,13/27] t5317: use ! grep to check for no matching lines [v4,14/27] t5703: simplify one-time-sed generation logic [v4,15/27] t5703: stop losing return codes of git commands [v4,16/27] t7501: remove spaces after redirect operators [v4,17/27] t7501: stop losing return codes of git commands [v4,18/27] t7700: drop redirections to /dev/null [v4,19/27] t7700: remove spaces after redirect operators [v4,20/27] t7700: move keywords onto their own line [v4,21/27] t7700: s/test -f/test_path_is_file/ [v4,22/27] t7700: consolidate code into test_no_missing_in_packs() [v4,23/27] squash! t7700: consolidate code into test_no_missing_in_packs() [v4,24/27] t7700: consolidate code into test_has_duplicate_object() [v4,25/27] t7700: replace egrep with grep [v4,26/27] t7700: make references to SHA-1 generic [v4,27/27] t7700: stop losing return codes of git commands

Message ID

fb614f4385745c804aea36e0471dfc96c0b97cb9.1574731022.git.liu.denton@gmail.com (mailing list archive)

State

New, archived

Headers

Date: Mon, 25 Nov 2019 17:18:48 -0800
From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
        Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH v4 27/27] t7700: stop losing return codes of git commands
Message-ID: 
 <fb614f4385745c804aea36e0471dfc96c0b97cb9.1574731022.git.liu.denton@gmail.com>
References: <cover.1574449072.git.liu.denton@gmail.com>
 <cover.1574731022.git.liu.denton@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <cover.1574731022.git.liu.denton@gmail.com>
User-Agent: Mutt/1.12.2 (2019-09-21)
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

t: test cleanup stemming from experimentally enabling pipefail | expand

Commit Message

Denton Liu Nov. 26, 2019, 1:18 a.m. UTC

In a pipe, only the return code of the last command is used. Thus, all
other commands will have their return codes masked. Rewrite pipes so
that there are no git commands upstream so that we will know if a
command fails.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
 t/t7700-repack.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index d96b1a5949..93b20bb7a8 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -48,14 +48,13 @@  test_expect_success 'objects in packs marked .keep are not repacked' '
 	git commit -m initial_commit &&
 	# Create two packs
 	# The first pack will contain all of the objects except one
-	git rev-list --objects --all | grep -v file2 |
-		git pack-objects pack &&
+	git rev-list --objects --all >objs &&
+	grep -v file2 objs | git pack-objects pack &&
 	# The second pack will contain the excluded object
-	packoid=$(git rev-list --objects --all | grep file2 |
-		git pack-objects pack) &&
+	packoid=$(grep file2 objs | git pack-objects pack) &&
 	>pack-$packoid.keep &&
-	objoid=$(git verify-pack -v pack-$packoid.idx | head -n 1 |
-		sed -e "s/^\($OID_REGEX\).*/\1/") &&
+	git verify-pack -v pack-$packoid.idx >packlist &&
+	objoid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
 	mv pack-* .git/objects/pack/ &&
 	git repack -A -d -l &&
 	git prune-packed &&
@@ -134,8 +133,8 @@  test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
 	    --unpack-unreachable </dev/null pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		grep "^$coid " | sort | uniq | wc -l) &&
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " packlist &&
 	echo >.git/objects/info/alternates &&
 	test_must_fail git show $coid
 '
@@ -151,8 +150,8 @@  test_expect_success 'local packed unreachable obs that exist in alternate ODB ar
 	    --unpack-unreachable </dev/null pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		grep "^$coid " | sort | uniq | wc -l) &&
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " &&
 	echo >.git/objects/info/alternates &&
 	test_must_fail git show $coid
 '

[v4,27/27] t7700: stop losing return codes of git commands

Commit Message

Patch