about summary refs log tree commit diff
path: root/third_party/git/t/t3419-rebase-patch-id.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/t3419-rebase-patch-id.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/t3419-rebase-patch-id.sh')
-rwxr-xr-xthird_party/git/t/t3419-rebase-patch-id.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/git/t/t3419-rebase-patch-id.sh b/third_party/git/t/t3419-rebase-patch-id.sh
index d93458377690..49f548cdb93d 100755
--- a/third_party/git/t/t3419-rebase-patch-id.sh
+++ b/third_party/git/t/t3419-rebase-patch-id.sh
@@ -80,8 +80,7 @@ do_tests () {
 		git commit -q -m "change big file again" &&
 		git checkout -q other^{} &&
 		git rebase master &&
-		git rev-list master...HEAD~ >revs &&
-		test_must_be_empty revs
+		test_must_fail test -n "$(git rev-list master...HEAD~)"
 	'
 
 	test_expect_success $pr 'do not drop patch' '
@@ -91,7 +90,7 @@ do_tests () {
 		git commit -q -m squashed &&
 		git checkout -q other^{} &&
 		test_must_fail git rebase squashed &&
-		git rebase --quit
+		rm -rf .git/rebase-apply
 	'
 }