commit c5fdccbf542b4d88db2f794fe6e81a7fc35c0b59
from: Yang Zhong <yzhong@freebsdfoundation.org>
date: Thu Dec 10 16:08:42 2020 UTC

fix expected output of test_tree_submodule_of_same_repo for packed repos

commit - 9cd7cbd12706001e5786d399b4421e5150c82be1
commit + c5fdccbf542b4d88db2f794fe6e81a7fc35c0b59
blob - 68b58e3ee50007e8b30b983b92b7e2536cb39a20
blob + 55ebc6f436998717ae62d3a3d5a556c082ba9d5f
--- regress/cmdline/tree.sh
+++ regress/cmdline/tree.sh
@@ -123,7 +123,13 @@ test_tree_submodule_of_same_repo() {
 		test_done "$testroot" "1"
 		return 1
 	fi
-	echo "got-read-tree: bad object data" > $testroot/stderr.expected
+	if [ -n "$GOT_TEST_PACK" ]; then
+		echo "got-read-pack: bad object data" \
+			> $testroot/stderr.expected
+	else
+		echo "got-read-tree: bad object data" \
+			> $testroot/stderr.expected
+	fi
 	echo "got: bad object data" >> $testroot/stderr.expected
 
 	cmp -s $testroot/stderr.expected $testroot/stderr