[v5,12/26] t5317: stop losing return codes of git commands

Message ID	1e08c2b68ba041f5bc94695481ddbd106e9bb4f4.1574884302.git.liu.denton@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=iCZD=ZT=vger.kernel.org=git-owner@kernel.org> Date: Wed, 27 Nov 2019 11:53:31 -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 v5 12/26] t5317: stop losing return codes of git commands Message-ID: <1e08c2b68ba041f5bc94695481ddbd106e9bb4f4.1574884302.git.liu.denton@gmail.com> References: <cover.1574731022.git.liu.denton@gmail.com> <cover.1574884302.git.liu.denton@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <cover.1574884302.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 [v5,00/26] t: test cleanup stemming from experimentally enabling pipefail [v5,01/26] lib-bash.sh: move `then` onto its own line [v5,02/26] apply-one-time-sed.sh: modernize style [v5,03/26] t0014: remove git command upstream of pipe [v5,04/26] t0090: stop losing return codes of git commands [v5,05/26] t3301: stop losing return codes of git commands [v5,06/26] t3600: use test_line_count() where possible [v5,07/26] t3600: stop losing return codes of git commands [v5,08/26] t3600: comment on inducing SIGPIPE in `git rm` [v5,09/26] t4015: stop losing return codes of git commands [v5,10/26] t4015: use test_write_lines() [v5,11/26] t4138: stop losing return codes of git commands [v5,12/26] t5317: stop losing return codes of git commands [v5,13/26] t5317: use ! grep to check for no matching lines [v5,14/26] t5703: simplify one-time-sed generation logic [v5,15/26] t5703: stop losing return codes of git commands [v5,16/26] t7501: remove spaces after redirect operators [v5,17/26] t7501: stop losing return codes of git commands [v5,18/26] t7700: drop redirections to /dev/null [v5,19/26] t7700: remove spaces after redirect operators [v5,20/26] t7700: move keywords onto their own line [v5,21/26] t7700: s/test -f/test_path_is_file/ [v5,22/26] t7700: consolidate code into test_no_missing_in_packs() [v5,23/26] t7700: consolidate code into test_has_duplicate_object() [v5,24/26] t7700: replace egrep with grep [v5,25/26] t7700: make references to SHA-1 generic [v5,26/26] t7700: stop losing return codes of git commands

Message ID

1e08c2b68ba041f5bc94695481ddbd106e9bb4f4.1574884302.git.liu.denton@gmail.com (mailing list archive)

State

New, archived

Headers

Date: Wed, 27 Nov 2019 11:53:31 -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 v5 12/26] t5317: stop losing return codes of git commands
Message-ID: 
 <1e08c2b68ba041f5bc94695481ddbd106e9bb4f4.1574884302.git.liu.denton@gmail.com>
References: <cover.1574731022.git.liu.denton@gmail.com>
 <cover.1574884302.git.liu.denton@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <cover.1574884302.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. 27, 2019, 7:53 p.m. UTC

Currently, there are two ways where the return codes of git commands are
lost. The first way is when a command is in the upstream of a pipe. 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.

The other way is when a command is in a non-assignment command
substitution. The return code will be lost in favour of the surrounding
command's. Rewrite instances of this such that git commands output to a
file and surrounding commands only call command substitutions with
non-git commands.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
 t/t5317-pack-objects-filter-objects.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 2d2f5d0229..a8bbad74e2 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -72,7 +72,8 @@  test_expect_success 'get an error for missing tree object' '
 	echo foo >r5/foo &&
 	git -C r5 add foo &&
 	git -C r5 commit -m "foo" &&
-	del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") &&
+	git -C r5 rev-parse HEAD^{tree} >tree &&
+	del=$(sed "s|..|&/|" tree) &&
 	rm r5/.git/objects/$del &&
 	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
 	HEAD
@@ -230,10 +231,9 @@  test_expect_success 'verify explicitly specifying oversized blob in input' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
-	HEAD
-	$(git -C r2 rev-parse HEAD:large.10000)
-	EOF
+	echo HEAD >objects &&
+	git -C r2 rev-parse HEAD:large.10000 >>objects &&
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
 	git -C r2 index-pack ../filter.pack &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
@@ -377,7 +377,8 @@  test_expect_success 'verify sparse:oid=OID' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
+	git -C r4 ls-files -s pattern >staged &&
+	oid=$(awk -f print_2.awk staged) &&
 	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
 	HEAD
 	EOF

[v5,12/26] t5317: stop losing return codes of git commands

Commit Message

Patch