Revert "Merge branch 'jc/patch-id' into maint-2.46"

This reverts commit 41c952ebacf7e3369e7bee721f768114d65e50c4,
reversing changes made to 712d970c0145b95ce655773e7cd1676f09dfd215.
Keeping a known breakage for now is better than introducing new
regression(s).

1 files changed, 0 insertions, 40 deletions

diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index dc8ddb10af..605faea0c7 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -114,46 +114,6 @@ test_expect_success 'patch-id supports git-format-patch output' '
 	test "$2" = $(git rev-parse HEAD)
 '
 
-test_expect_success 'patch-id computes the same for various formats' '
-	# This test happens to consider "git log -p -1" output
-	# the canonical input format, so use it as the norm.
-	git log -1 -p same >log-p.output &&
-	git patch-id <log-p.output >expect &&
-
-	# format-patch begins with "From <commit object name>"
-	git format-patch -1 --stdout same >format-patch.output &&
-	git patch-id <format-patch.output >actual &&
-	test_cmp actual expect &&
-
-	# "diff-tree --stdin -p" begins with "<commit object name>"
-	same=$(git rev-parse same) &&
-	echo $same | git diff-tree --stdin -p >diff-tree.output &&
-	git patch-id <diff-tree.output >actual &&
-	test_cmp actual expect &&
-
-	# "diff-tree --stdin -v -p" begins with "commit <commit object name>"
-	echo $same | git diff-tree --stdin -p -v >diff-tree-v.output &&
-	git patch-id <diff-tree-v.output >actual &&
-	test_cmp actual expect
-'
-
-hash=$(git rev-parse same:)
-for cruft in "$hash" "commit $hash is bad" "From $hash status"
-do
-	test_expect_success "patch-id with <$cruft> in log message" '
-		git format-patch -1 --stdout same >patch-0 &&
-		git patch-id <patch-0 >expect &&
-
-		{
-			sed -e "/^$/q" patch-0 &&
-			printf "random message\n%s\n\n" "$cruft" &&
-			sed -e "1,/^$/d" patch-0
-		} >patch-cruft &&
-		git patch-id <patch-cruft >actual &&
-		test_cmp actual expect
-	'
-done
-
 test_expect_success 'whitespace is irrelevant in footer' '
 	get_patch_id main &&
 	git checkout same &&