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/t3504-cherry-pick-rerere.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'third_party/git/t/t3504-cherry-pick-rerere.sh') diff --git a/third_party/git/t/t3504-cherry-pick-rerere.sh b/third_party/git/t/t3504-cherry-pick-rerere.sh index 80a0d0870653..a267b2d144df 100755 --- a/third_party/git/t/t3504-cherry-pick-rerere.sh +++ b/third_party/git/t/t3504-cherry-pick-rerere.sh @@ -94,10 +94,8 @@ test_expect_success 'cherry-pick --rerere-autoupdate more than once' ' test_expect_success 'cherry-pick conflict without rerere' ' test_config rerere.enabled false && - test_must_fail git cherry-pick foo-master && - grep ===== foo && - grep foo-dev foo && - grep foo-master foo + test_must_fail git cherry-pick master && + test_must_fail test_cmp expect foo ' test_done -- cgit 1.4.1