diff options
| author | Mike Frysinger <vapier@google.com> | 2021-05-04 19:46:09 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2021-05-04 22:43:09 -0400 |
| commit | 148e1ce81addc9d41238e6f67bde8ef930851f58 (patch) | |
| tree | d1c5ae63e09b16ab2b6c75e6e198cb4c5b5c8da5 | |
| parent | 32ca6687ae422bda773f10fe7d88100de034b541 (diff) | |
| download | git-repo-148e1ce81addc9d41238e6f67bde8ef930851f58.tar.gz | |
sync: fix recursive fetchingv2.14.5
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.py | 2 |
1 files changed, 1 insertions, 1 deletions
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. | |||
| 887 | if previously_missing_set == missing_set: | 887 | if previously_missing_set == missing_set: |
| 888 | break | 888 | break |
| 889 | previously_missing_set = missing_set | 889 | previously_missing_set = missing_set |
| 890 | success, new_fetched = self._Fetch(to_fetch, opt, err_event) | 890 | success, new_fetched = self._Fetch(missing, opt, err_event) |
| 891 | if not success: | 891 | if not success: |
| 892 | err_event.set() | 892 | err_event.set() |
| 893 | fetched.update(new_fetched) | 893 | fetched.update(new_fetched) |