commit 0011115f95cf8ff41cdff0560c75168725ec4f77
author Keith Smiley <keithbsmiley@gmail.com> Thu Aug 26 04:53:41 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Aug 26 04:55:14 2021 -0700
tree 9950d6f62acd1d2647b045dfce92cbca7e64e182
parent 832d6b479d87a174d888643a05e5c272c4bc908d

Flip init_submodules vs recursive_init_submodules check

If you set both of these attrs, we should recursively setup submodules

Closes #13903.

PiperOrigin-RevId: 393097513

tools/build_defs/repo/git_worker.bzl

diff --git a/tools/build_defs/repo/git_worker.bzl b/tools/build_defs/repo/git_worker.bzl
index 59cb0fa..4983604 100644
--- a/tools/build_defs/repo/git_worker.bzl
+++ b/tools/build_defs/repo/git_worker.bzl
@@ -104,12 +104,12 @@
     reset(ctx, git_repo)
     clean(ctx, git_repo)
 
-    if git_repo.init_submodules:
-        ctx.report_progress("Updating submodules")
-        update_submodules(ctx, git_repo)
-    elif git_repo.recursive_init_submodules:
+    if git_repo.recursive_init_submodules:
         ctx.report_progress("Updating submodules recursively")
         update_submodules(ctx, git_repo, recursive = True)
+    elif git_repo.init_submodules:
+        ctx.report_progress("Updating submodules")
+        update_submodules(ctx, git_repo)
 
 def init(ctx, git_repo):
     cl = ["git", "init", str(git_repo.directory)]