From 148e1ce81addc9d41238e6f67bde8ef930851f58 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 4 May 2021 19:46:09 -0400 Subject: [PATCH] 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 Tested-by: Mike Frysinger --- subcmds/sync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subcmds/sync.py b/subcmds/sync.py index aafec1d2..d41052d7 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -887,7 +887,7 @@ later is required to fix a server side protocol bug. if previously_missing_set == missing_set: break previously_missing_set = missing_set - success, new_fetched = self._Fetch(to_fetch, opt, err_event) + success, new_fetched = self._Fetch(missing, opt, err_event) if not success: err_event.set() fetched.update(new_fetched)