revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232, reversing changes made tof2b211131f.
This commit is contained in:
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
5
third_party/git/t/t3419-rebase-patch-id.sh
vendored
5
third_party/git/t/t3419-rebase-patch-id.sh
vendored
|
|
@ -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
|
||||
'
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue