merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
5
third_party/git/t/t4134-apply-submodule.sh
vendored
5
third_party/git/t/t4134-apply-submodule.sh
vendored
|
|
@ -8,6 +8,7 @@ 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
|
||||
|
|
@ -15,7 +16,7 @@ index 0000000..0123456
|
|||
--- /dev/null
|
||||
+++ b/dir/sm
|
||||
@@ -0,0 +1 @@
|
||||
+Subproject commit 0123456789abcdef0123456789abcdef01234567
|
||||
+Subproject commit $(test_oid numeric)
|
||||
EOF
|
||||
cat > remove-sm.patch <<EOF
|
||||
diff --git a/dir/sm b/dir/sm
|
||||
|
|
@ -24,7 +25,7 @@ index 0123456..0000000
|
|||
--- a/dir/sm
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-Subproject commit 0123456789abcdef0123456789abcdef01234567
|
||||
-Subproject commit $(test_oid numeric)
|
||||
EOF
|
||||
'
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue