summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2021-05-04 19:46:09 -0400
committerMike Frysinger <vapier@google.com>2021-05-05 02:42:23 +0000
commit219431e1c9868e8d5e51308d0c42bb084c510ea9 (patch)
tree7b3713b58e81266039d80a9a4b8d931d88e75276
parent5ba80d404cd6d5dc6d1ccfcfc5f8fc560d82be06 (diff)
downloadgit-repo-219431e1c9868e8d5e51308d0c42bb084c510ea9.tar.gz
sync: fix recursive fetching
Commit b2fa30a2b891b22c173c960a67bf38ccbba8de1b ("sync: switch network fetch to multiprocessing") accidentally changed the variable passed to the 2nd fetch call from |missing| to |to_fetch| due to a copy & paste of the earlier changed logic. Undo that to fix git submodule fetching. Bug: https://crbug.com/gerrit/14489 Change-Id: I627954f80fd2e80d9d5809b530aa6b0ef9260abb Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/305262 Reviewed-by: Raman Tenneti <rtenneti@google.com> Tested-by: Mike Frysinger <vapier@google.com>
-rw-r--r--subcmds/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 13ae0fed..d3c326ac 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -959,7 +959,7 @@ later is required to fix a server side protocol bug.
959 if previously_missing_set == missing_set: 959 if previously_missing_set == missing_set:
960 break 960 break
961 previously_missing_set = missing_set 961 previously_missing_set = missing_set
962 success, new_fetched = self._Fetch(to_fetch, opt, err_event) 962 success, new_fetched = self._Fetch(missing, opt, err_event)
963 if not success: 963 if not success:
964 err_event.set() 964 err_event.set()
965 fetched.update(new_fetched) 965 fetched.update(new_fetched)