From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Feb 2021 22:21:04 +0000 (-0800)
Subject: Merge branch 'ab/tests-various-fixup'
X-Git-Tag: v2.31.0-rc0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c873f97913994f8478a9078ff8b62e17378a0ed;p=thirdparty%2Fgit.git

Merge branch 'ab/tests-various-fixup'

Various test updates.

* ab/tests-various-fixup:
  rm tests: actually test for SIGPIPE in SIGPIPE test
  archive tests: use a cheaper "zipinfo -h" invocation to get header
  upload-pack tests: avoid a non-zero "grep" exit status
  git-svn tests: rewrite brittle tests to use "--[no-]merges".
  git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
  git svn mergeinfo tests: modernize redirection & quoting style
  cache-tree tests: explicitly test HEAD and index differences
  cache-tree tests: use a sub-shell with less indirection
  cache-tree tests: remove unused $2 parameter
  cache-tree tests: refactor for modern test style
---

2c873f97913994f8478a9078ff8b62e17378a0ed
diff --cc t/t9151-svn-mergeinfo.sh
index 696ace2462,c33bae91fb..1fbe84feb1
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@@ -48,13 -42,13 +45,13 @@@ test_expect_success 'merging two branch
  	f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
  	f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
  	merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
- 	not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
- 	[ -z "$not_reachable" ]
- 	'
+ 	git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
+ 	test_must_be_empty not-reachable
+ '
  
  test_expect_failure 'everything got merged in the end' '
- 	unmerged=$(git rev-list --all --not main) &&
- 	[ -z "$unmerged" ]
- 	'
 -	git rev-list --all --not master >unmerged &&
++	git rev-list --all --not main >unmerged &&
+ 	test_must_be_empty unmerged
+ '
  
  test_done