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/t4134-apply-submodule.sh
vendored
5
third_party/git/t/t4134-apply-submodule.sh
vendored
|
|
@ -8,7 +8,6 @@ test_description='git apply submodule tests'
|
|||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
test_oid_init &&
|
||||
cat > create-sm.patch <<EOF &&
|
||||
diff --git a/dir/sm b/dir/sm
|
||||
new file mode 160000
|
||||
|
|
@ -16,7 +15,7 @@ index 0000000..0123456
|
|||
--- /dev/null
|
||||
+++ b/dir/sm
|
||||
@@ -0,0 +1 @@
|
||||
+Subproject commit $(test_oid numeric)
|
||||
+Subproject commit 0123456789abcdef0123456789abcdef01234567
|
||||
EOF
|
||||
cat > remove-sm.patch <<EOF
|
||||
diff --git a/dir/sm b/dir/sm
|
||||
|
|
@ -25,7 +24,7 @@ index 0123456..0000000
|
|||
--- a/dir/sm
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-Subproject commit $(test_oid numeric)
|
||||
-Subproject commit 0123456789abcdef0123456789abcdef01234567
|
||||
EOF
|
||||
'
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue