From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Mar 2015 18:57:13 +0000 (-0700)
Subject: Merge branch 'jk/test-chain-lint'
X-Git-Tag: v2.4.0-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/30db51a3fec68bfa5a59b9b3886162f536e37320

Merge branch 'jk/test-chain-lint'

People often forget to chain the commands in their test together
with &&, leaving a failure from an earlier command in the test go
unnoticed.  The new GIT_TEST_CHAIN_LINT mechanism allows you to
catch such a mistake more easily.

* jk/test-chain-lint: (36 commits)
t9001: drop save_confirm helper
t0020: use test_* helpers instead of hand-rolled messages
t: simplify loop exit-code status variables
t: fix some trivial cases of ignored exit codes in loops
t7701: fix ignored exit code inside loop
t3305: fix ignored exit code inside loop
t0020: fix ignored exit code inside loops
perf-lib: fix ignored exit code inside loop
t6039: fix broken && chain
t9158, t9161: fix broken &&-chain in git-svn tests
t9104: fix test for following larger parents
t4104: drop hand-rolled error reporting
t0005: fix broken &&-chains
t7004: fix embedded single-quotes
t0050: appease --chain-lint
t9001: use test_when_finished
t4117: use modern test_* helpers
t6034: use modern test_* helpers
t1301: use modern test_* helpers
t0020: use modern test_* helpers
...
---

30db51a3fec68bfa5a59b9b3886162f536e37320
diff --cc t/t4052-stat-output.sh
index babd2ead88,4a02b17fc8..9f563db20a
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@@ -99,10 -99,10 +99,10 @@@ d
  		test_cmp "$expect" actual
  	'
  
 -	test "$cmd" != diff || continue
 +	case "$cmd" in diff|show) continue;; esac
  
  	test_expect_success "$cmd --graph $verb COLUMNS (big change)" '
- 		COLUMNS=200 git $cmd $args --graph >output
+ 		COLUMNS=200 git $cmd $args --graph >output &&
  		grep " | " output >actual &&
  		test_cmp "$expect-graph" actual
  	'
@@@ -127,10 -127,10 +127,10 @@@ d
  		test_cmp "$expect" actual
  	'
  
 -	test "$cmd" != diff || continue
 +	case "$cmd" in diff|show) continue;; esac
  
  	test_expect_success "$cmd --graph $verb not enough COLUMNS (big change)" '
- 		COLUMNS=40 git $cmd $args --graph >output
+ 		COLUMNS=40 git $cmd $args --graph >output &&
  		grep " | " output >actual &&
  		test_cmp "$expect-graph" actual
  	'
@@@ -155,10 -155,10 +155,10 @@@ d
  		test_cmp "$expect" actual
  	'
  
 -	test "$cmd" != diff || continue
 +	case "$cmd" in diff|show) continue;; esac
  
  	test_expect_success "$cmd --graph $verb statGraphWidth config" '
- 		git -c diff.statGraphWidth=26 $cmd $args --graph >output
+ 		git -c diff.statGraphWidth=26 $cmd $args --graph >output &&
  		grep " | " output >actual &&
  		test_cmp "$expect-graph" actual
  	'
@@@ -196,10 -196,10 +196,10 @@@ d
  		test_cmp expect actual
  	'
  
 -	test "$cmd" != diff || continue
 +	case "$cmd" in diff|show) continue;; esac
  
  	test_expect_success "$cmd --stat-width=width --graph with big change" '
- 		git $cmd $args --stat-width=40 --graph >output
+ 		git $cmd $args --stat-width=40 --graph >output &&
  		grep " | " output >actual &&
  		test_cmp expect-graph actual
  	'
@@@ -270,10 -270,10 +270,10 @@@ d
  		test_cmp "$expect" actual
  	'
  
 -	test "$cmd" != diff || continue
 +	case "$cmd" in diff|show) continue;; esac
  
  	test_expect_success "$cmd --graph $verb COLUMNS (long filename)" '
- 		COLUMNS=200 git $cmd $args --graph >output
+ 		COLUMNS=200 git $cmd $args --graph >output &&
  		grep " | " output >actual &&
  		test_cmp "$expect-graph" actual
  	'