Skip to content

Commit

Permalink
Merge pull request #569 from jkloetzke/fix-568
Browse files Browse the repository at this point in the history
git: do not recurse automatically into submodules
  • Loading branch information
jkloetzke authored Jun 8, 2024
2 parents 63a01b7 + 12afe2f commit 2a42a1a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pym/bob/scm/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ async def __forwardBranch(self, invoker, oldUpstreamCommit):
async def __checkoutSubmodules(self, invoker):
if not self.__submodules: return

args = ["git", "submodule", "update", "--init"]
args = ["git", "-c", "submodule.recurse=0", "submodule", "update", "--init"]
if self.__shallowSubmodules:
args += ["--depth", "1"]
if self.__recurseSubmodules:
Expand Down Expand Up @@ -497,7 +497,7 @@ async def __updateSubmodulesPost(self, invoker, oldState, base = "."):
return {}

# Sync remote URLs into our config in case they were changed
args = ["git", "-C", base, "submodule", "sync"]
args = ["git", "-c", "submodule.recurse=0", "-C", base, "submodule", "sync"]
await invoker.checkCommand(args, cwd=self.__dir)

# List all paths as per .gitmodules. This gives us the list of all
Expand Down Expand Up @@ -526,7 +526,7 @@ async def __updateSubmodulesPost(self, invoker, oldState, base = "."):
}

# Do the update of safe submodules
args = ["git", "-C", base, "submodule", "update", "--init"]
args = ["git", "-c", "submodule.recurse=0", "-C", base, "submodule", "update", "--init"]
if self.__shallowSubmodules:
args += ["--depth", "1"]
args.append("--")
Expand Down

0 comments on commit 2a42a1a

Please sign in to comment.