diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t4134-apply-submodule.sh | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (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/t4134-apply-submodule.sh')
| -rwxr-xr-x | third_party/git/t/t4134-apply-submodule.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/git/t/t4134-apply-submodule.sh b/third_party/git/t/t4134-apply-submodule.sh index 99ed4cc54676..0043930ca6ab 100755 --- a/third_party/git/t/t4134-apply-submodule.sh +++ b/third_party/git/t/t4134-apply-submodule.sh @@ -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 ' |