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/t1410-reflog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/git/t/t1410-reflog.sh') diff --git a/third_party/git/t/t1410-reflog.sh b/third_party/git/t/t1410-reflog.sh index 76d9b744a64b..82950c02825c 100755 --- a/third_party/git/t/t1410-reflog.sh +++ b/third_party/git/t/t1410-reflog.sh @@ -195,7 +195,7 @@ test_expect_success 'delete' ' git reflog delete master@{1} && git reflog show master > output && - test_line_count = $(($master_entry_count - 1)) output && + test $(($master_entry_count - 1)) = $(wc -l < output) && test $HEAD_entry_count = $(git reflog | wc -l) && ! grep ox < output && @@ -209,7 +209,7 @@ test_expect_success 'delete' ' git reflog delete master@{07.04.2005.15:15:00.-0700} && git reflog show master > output && - test_line_count = $(($master_entry_count - 1)) output && + test $(($master_entry_count - 1)) = $(wc -l < output) && ! grep dragon < output ' -- cgit 1.4.1