From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Oct 2018 07:16:01 +0000 (+0900)
Subject: Merge branch 'md/test-cleanup'
X-Git-Tag: v2.20.0-rc0~183
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f2e2136ad7291524a2b67a179dea493f4a562453

Merge branch 'md/test-cleanup'

Various test scripts have been updated for style and also correct
handling of exit status of various commands.

* md/test-cleanup:
tests: order arguments to git-rev-list properly
t9109: don't swallow Git errors upstream of pipes
tests: don't swallow Git errors upstream of pipes
t/*: fix ordering of expected/observed arguments
tests: standardize pipe placement
Documentation: add shell guidelines
t/README: reformat Do, Don't, Keep in mind lists
---

f2e2136ad7291524a2b67a179dea493f4a562453
diff --cc t/t0000-basic.sh
index 391f910c6a,224c098a85..26601e698b
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@@ -1085,19 -1006,19 +1085,19 @@@ test_expect_success 'git read-tree foll
  	test "$newtree" = "$tree"
  '
  
 -test_expect_success SHA1 'validate git diff-files output for a know cache/work tree state' '
 -	cat >expected <<\EOF &&
 -:100644 100644 f87290f8eb2cbbea7857214459a0739927eab154 0000000000000000000000000000000000000000 M	path0
 -:120000 120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0000000000000000000000000000000000000000 M	path0sym
 -:100644 100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0000000000000000000000000000000000000000 M	path2/file2
 -:120000 120000 d8ce161addc5173867a3c3c730924388daedbc38 0000000000000000000000000000000000000000 M	path2/file2sym
 -:100644 100644 0aa34cae68d0878578ad119c86ca2b5ed5b28376 0000000000000000000000000000000000000000 M	path3/file3
 -:120000 120000 8599103969b43aff7e430efea79ca4636466794f 0000000000000000000000000000000000000000 M	path3/file3sym
 -:100644 100644 00fb5908cb97c2564a9783c0c64087333b3b464f 0000000000000000000000000000000000000000 M	path3/subp3/file3
 -:120000 120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0000000000000000000000000000000000000000 M	path3/subp3/file3sym
 +test_expect_success 'validate git diff-files output for a know cache/work tree state' '
 +	cat >expected <<EOF &&
 +:100644 100644 $(test_oid path0f) $ZERO_OID M	path0
 +:120000 120000 $(test_oid path0s) $ZERO_OID M	path0sym
 +:100644 100644 $(test_oid path2f) $ZERO_OID M	path2/file2
 +:120000 120000 $(test_oid path2s) $ZERO_OID M	path2/file2sym
 +:100644 100644 $(test_oid path3f) $ZERO_OID M	path3/file3
 +:120000 120000 $(test_oid path3s) $ZERO_OID M	path3/file3sym
 +:100644 100644 $(test_oid subp3f) $ZERO_OID M	path3/subp3/file3
 +:120000 120000 $(test_oid subp3s) $ZERO_OID M	path3/subp3/file3sym
  EOF
  	git diff-files >current &&
- 	test_cmp current expected
+ 	test_cmp expected current
  '
  
  test_expect_success 'git update-index --refresh should succeed' '
diff --cc t/t5701-git-serve.sh
index 29a54fbfff,bf139e2459..ae79c6bbc0
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@@ -15,8 -15,8 +15,8 @@@ test_expect_success 'test capability ad
  	EOF
  
  	git serve --advertise-capabilities >out &&
 -	test-pkt-line unpack <out >actual &&
 +	test-tool pkt-line unpack <out >actual &&
- 	test_cmp actual expect
+ 	test_cmp expect actual
  '
  
  test_expect_success 'stateless-rpc flag does not list capabilities' '
@@@ -88,8 -88,8 +88,8 @@@ test_expect_success 'basics of ls-refs
  	EOF
  
  	git serve --stateless-rpc <in >out &&
 -	test-pkt-line unpack <out >actual &&
 +	test-tool pkt-line unpack <out >actual &&
- 	test_cmp actual expect
+ 	test_cmp expect actual
  '
  
  test_expect_success 'basic ref-prefixes' '
@@@ -108,8 -108,8 +108,8 @@@
  	EOF
  
  	git serve --stateless-rpc <in >out &&
 -	test-pkt-line unpack <out >actual &&
 +	test-tool pkt-line unpack <out >actual &&
- 	test_cmp actual expect
+ 	test_cmp expect actual
  '
  
  test_expect_success 'refs/heads prefix' '
@@@ -128,8 -128,8 +128,8 @@@
  	EOF
  
  	git serve --stateless-rpc <in >out &&
 -	test-pkt-line unpack <out >actual &&
 +	test-tool pkt-line unpack <out >actual &&
- 	test_cmp actual expect
+ 	test_cmp expect actual
  '
  
  test_expect_success 'peel parameter' '
@@@ -149,8 -149,8 +149,8 @@@
  	EOF
  
  	git serve --stateless-rpc <in >out &&
 -	test-pkt-line unpack <out >actual &&
 +	test-tool pkt-line unpack <out >actual &&
- 	test_cmp actual expect
+ 	test_cmp expect actual
  '
  
  test_expect_success 'symrefs parameter' '
@@@ -170,8 -170,8 +170,8 @@@
  	EOF
  
  	git serve --stateless-rpc <in >out &&
 -	test-pkt-line unpack <out >actual &&
 +	test-tool pkt-line unpack <out >actual &&
- 	test_cmp actual expect
+ 	test_cmp expect actual
  '
  
  test_expect_success 'sending server-options' '
@@@ -190,8 -190,8 +190,8 @@@
  	EOF
  
  	git serve --stateless-rpc <in >out &&
 -	test-pkt-line unpack <out >actual &&
 +	test-tool pkt-line unpack <out >actual &&
- 	test_cmp actual expect
+ 	test_cmp expect actual
  '
  
  test_expect_success 'unexpected lines are not allowed in fetch request' '