about summary refs log tree commit diff
path: root/third_party/git/t/t3504-cherry-pick-rerere.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/t3504-cherry-pick-rerere.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/t3504-cherry-pick-rerere.sh')
-rwxr-xr-xthird_party/git/t/t3504-cherry-pick-rerere.sh6
1 files changed, 2 insertions, 4 deletions
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