From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/t/t4000-diff-format.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/git/t/t4000-diff-format.sh') diff --git a/third_party/git/t/t4000-diff-format.sh b/third_party/git/t/t4000-diff-format.sh index e5116a76a1cc..8de36b7d1222 100755 --- a/third_party/git/t/t4000-diff-format.sh +++ b/third_party/git/t/t4000-diff-format.sh @@ -78,7 +78,7 @@ test_expect_success 'git diff-files --no-patch --patch shows the patch' ' test_expect_success 'git diff-files --no-patch --patch-with-raw shows the patch and raw data' ' git diff-files --no-patch --patch-with-raw >actual && - grep -q "^:100644 100755 .* $ZERO_OID M path0\$" actual && + grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M path0\$" actual && tail -n +4 actual >actual-patch && compare_diff_patch expected actual-patch ' -- cgit 1.4.1