merge(3p/git): Merge git upstream at v2.26.2

This commit is contained in:
Vincent Ambo 2020-05-22 17:46:45 +01:00
commit 5229c9b232
1006 changed files with 149006 additions and 60819 deletions

View file

@ -14,7 +14,8 @@ test_expect_success 'setup' '
cd sub &&
git init &&
test_commit subcommit1 &&
git tag sub_when_added_to_super
git tag sub_when_added_to_super &&
git branch other
) &&
git submodule add "file://$pwd/sub" sub &&
git commit -m "add submodule" &&
@ -51,4 +52,14 @@ test_expect_success 'check the default is --no-remote-submodules' '
)
'
test_expect_success 'clone with --single-branch' '
test_when_finished "rm -rf super_clone" &&
git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
(
cd super_clone/sub &&
git rev-parse --verify origin/master &&
test_must_fail git rev-parse --verify origin/other
)
'
test_done