From 5ae8292fea94bc26aa8c7345f5230899d3d45a63 Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Fri, 31 Jan 2025 12:00:52 -0800 Subject: [PATCH] Revert "sync: skip network half on repo upgrade" This reverts commit 61224d01fa29bcf54dd6d521e09e09a8c0da77fe. Reason for revert: the manifest will be updated during in the post-upgrade process, and that can result in a missing object in LocalHalf, since NetworkHalf is not skipped. Bug: b/392979411 Change-Id: I8a46e5b54093ed78285c8b30f000bb08a8244179 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/450181 Tested-by: Josip Sokcevic Commit-Queue: Josip Sokcevic Reviewed-by: Scott Lee --- subcmds/sync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subcmds/sync.py b/subcmds/sync.py index f7ed49e4..978b3beb 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -1834,7 +1834,7 @@ later is required to fix a server side protocol bug. self._fetch_times = _FetchTimes(manifest) self._local_sync_state = LocalSyncState(manifest) - if not opt.local_only and not opt.repo_upgraded: + if not opt.local_only: with multiprocessing.Manager() as manager: with ssh.ProxyManager(manager) as ssh_proxy: # Initialize the socket dir once in the parent.