about summary refs log tree commit diff
path: root/third_party/git/t/t1410-reflog.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t1410-reflog.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t1410-reflog.sh')
-rwxr-xr-xthird_party/git/t/t1410-reflog.sh4
1 files changed, 2 insertions, 2 deletions
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
 
 '