t: drop debug cat calls

Martin Ågren · gitster · commit 3c29e21eb047 · 2020-02-24T11:18:25.000-08:00
We `cat` files, but don't inspect or grab the contents in any way.
Unlike in an earlier commit, there is no reason to suspect that these
files could be missing, so `cat`-ing them is just wasted effort.

Signed-off-by: Martin Ågren &lt;martin.agren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
@@ -795,7 +795,6 @@ test_expect_success PERL 'missing file in delayed checkout' '
 
 	rm -rf repo-cloned &&
 	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
-	cat git-stderr.log &&
 	grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
 '
 
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh
@@ -75,7 +75,7 @@ test_expect_success 'for_each_reflog()' '
 '
 
 test_expect_success 'for_each_reflog_ent()' '
-	$RUN for-each-reflog-ent HEAD >actual && cat actual &&
+	$RUN for-each-reflog-ent HEAD >actual &&
 	head -n1 actual | grep first &&
 	tail -n2 actual | head -n1 | grep master.to.new
 '
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
@@ -141,7 +141,6 @@ test_expect_success 'email without @ is okay' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	git fsck 2>out &&
-	cat out &&
 	! grep "commit $new" out
 '
 
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
@@ -9,7 +9,6 @@ Tests for command-line parsing and basic operation.
 
 test_expect_success 'update-index --nonsense fails' '
 	test_must_fail git update-index --nonsense 2>msg &&
-	cat msg &&
 	test -s msg
 '
 
diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh
@@ -130,7 +130,6 @@ test_expect_success '--recurse-submodules and pathspecs setup' '
 
 	git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual &&
-	cat actual &&
 	git ls-files --recurse-submodules "*" >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
@@ -150,7 +150,6 @@ test_expect_success 'pull request after push' '
 		git request-pull initial origin master:for-upstream >../request
 	) &&
 	sed -nf read-request.sed <request >digest &&
-	cat digest &&
 	{
 		read task &&
 		read repository &&
@@ -179,7 +178,6 @@ test_expect_success 'request asks HEAD to be pulled' '
 		git request-pull initial "$downstream_url" >../request
 	) &&
 	sed -nf read-request.sed <request >digest &&
-	cat digest &&
 	{
 		read task &&
 		read repository &&
diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh
@@ -56,14 +56,13 @@ test_expect_success 'short line' '
 
 test_expect_success 'case-insensitive' '
 	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
-	cat output &&
 	test_decode_color <output >decoded &&
 	grep "<BOLD;RED>error<RESET>: error" decoded &&
 	grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
 '
 
 test_expect_success 'leading space' '
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&        cat output &&
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&
 	test_decode_color <output >decoded &&
 	grep "  <BOLD;RED>error<RESET>: leading space" decoded
 '
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
@@ -354,7 +354,6 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
 # the strange name is: a\!'b
 test_expect_success 'quoting of a strangely named repo' '
 	test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
-	cat result &&
 	grep "fatal: '\''a\\\\!'\''b'\''" result
 '
 
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
@@ -173,7 +173,6 @@ test_expect_success 'blame during cherry-pick with file rename conflict' '
 	git show HEAD@{1}:rodent > rodent &&
 	git add rodent &&
 	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
-	cat current &&
 	cat >expected <<-\EOF &&
 	mouse-Initial
 	mouse-Second
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
@@ -1047,7 +1047,6 @@ test_expect_success 'M: rename root to subdirectory' '
 	EOF
 	git fast-import <input &&
 	git diff-tree -M -r M4^ M4 >actual &&
-	cat actual &&
 	compare_diff_raw expect actual
 '
 
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
@@ -202,7 +202,6 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
 		export PATH &&
 		test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
 	) &&
-	cat errs &&
 	test_i18ngrep ! Traceback errs
 '
 

Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,6 @@ test_expect_success PERL 'missing file in delayed checkout' '`
`795`	`795`
`796`	`796`	`rm -rf repo-cloned &&`
`797`	`797`	`test_must_fail git clone repo repo-cloned 2>git-stderr.log &&`
`798`		`- cat git-stderr.log &&`
`799`	`798`	`grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log`
`800`	`799`	`'`
`801`	`800`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ test_expect_success 'for_each_reflog()' '`
`75`	`75`	`'`
`76`	`76`
`77`	`77`	`test_expect_success 'for_each_reflog_ent()' '`
`78`		`- $RUN for-each-reflog-ent HEAD >actual && cat actual &&`
	`78`	`+ $RUN for-each-reflog-ent HEAD >actual &&`
`79`	`79`	`head -n1 actual \| grep first &&`
`80`	`80`	`tail -n2 actual \| head -n1 \| grep master.to.new`
`81`	`81`	`'`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ test_expect_success 'email without @ is okay' '`
`141`	`141`	`git update-ref refs/heads/bogus "$new" &&`
`142`	`142`	`test_when_finished "git update-ref -d refs/heads/bogus" &&`
`143`	`143`	`git fsck 2>out &&`
`144`		`- cat out &&`
`145`	`144`	`! grep "commit $new" out`
`146`	`145`	`'`
`147`	`146`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ Tests for command-line parsing and basic operation.`
`9`	`9`
`10`	`10`	`test_expect_success 'update-index --nonsense fails' '`
`11`	`11`	`test_must_fail git update-index --nonsense 2>msg &&`
`12`		`- cat msg &&`
`13`	`12`	`test -s msg`
`14`	`13`	`'`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ test_expect_success '--recurse-submodules and pathspecs setup' '`
`130`	`130`
`131`	`131`	`git ls-files --recurse-submodules >actual &&`
`132`	`132`	`test_cmp expect actual &&`
`133`		`- cat actual &&`
`134`	`133`	`git ls-files --recurse-submodules "*" >actual &&`
`135`	`134`	`test_cmp expect actual`
`136`	`135`	`'`
Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,13 @@ test_expect_success 'short line' '`
`56`	`56`
`57`	`57`	`test_expect_success 'case-insensitive' '`
`58`	`58`	`git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&`
`59`		`- cat output &&`
`60`	`59`	`test_decode_color <output >decoded &&`
`61`	`60`	`grep "<BOLD;RED>error<RESET>: error" decoded &&`
`62`	`61`	`grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded`
`63`	`62`	`'`
`64`	`63`
`65`	`64`	`test_expect_success 'leading space' '`
`66`		`- git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output && cat output &&`
	`65`	`+ git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&`
`67`	`66`	`test_decode_color <output >decoded &&`
`68`	`67`	`grep " <BOLD;RED>error<RESET>: leading space" decoded`
`69`	`68`	`'`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,6 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge`
`354`	`354`	`# the strange name is: a\!'b`
`355`	`355`	`test_expect_success 'quoting of a strangely named repo' '`
`356`	`356`	`test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&`
`357`		`- cat result &&`
`358`	`357`	`grep "fatal: '\''a\\\\!'\''b'\''" result`
`359`	`358`	`'`
`360`	`359`
Original file line number	Diff line number	Diff line change
`@@ -1047,7 +1047,6 @@ test_expect_success 'M: rename root to subdirectory' '`
`1047`	`1047`	`EOF`
`1048`	`1048`	`git fast-import <input &&`
`1049`	`1049`	`git diff-tree -M -r M4^ M4 >actual &&`
`1050`		`- cat actual &&`
`1051`	`1050`	`compare_diff_raw expect actual`
`1052`	`1051`	`'`
`1053`	`1052`