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

@ -200,9 +200,9 @@ int repo_submodule_init(struct repository *subrepo,
if (repo_init(subrepo, gitdir.buf, worktree.buf)) {
/*
* If initilization fails then it may be due to the submodule
* If initialization fails then it may be due to the submodule
* not being populated in the superproject's worktree. Instead
* we can try to initilize the submodule by finding it's gitdir
* we can try to initialize the submodule by finding it's gitdir
* in the superproject's 'modules' directory. In this case the
* submodule would not have a worktree.
*/