sync: Fix force_checkout propagation

The force_checkout parameter was not propagated in all calls to
Checkout in Sync_LocalHalf.

Without this, repo sync --force-checkout can still fail for projects
currently on a local branch with no upstream/tracking configuration,
because the detach-to-manifest checkout was executed without -f,
leaving local modifications or untracked files able to block sync.

Change-Id: I58551388e2f906c4db96e220707a369057a71c24
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/579181
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Josef Malmstrom <Josef.Malmstrom@arm.com>
Tested-by: Josef Malmstrom <Josef.Malmstrom@arm.com>
Reviewed-by: Mike Frysinger <vapier@google.com>

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/test_project.py b/tests/test_project.py
index 6a04ea455..1deec0726 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -663,6 +663,36 @@ class StatelessSyncTests(unittest.TestCase):
                 capture_stderr=True,
             )
 
+    def test_sync_local_half_no_upstream_propagates_force_checkout(self):
+        """Test Sync_LocalHalf forwards force_checkout when detaching."""
+        with utils_for_test.TempGitTree() as tempdir:
+            proj = self._get_project(tempdir)
+
+            proj._InitWorkTree = mock.MagicMock()
+            proj.CleanPublishedCache = mock.MagicMock()
+            proj.GetRevisionId = mock.MagicMock(return_value="1234abcd")
+            proj._Checkout = mock.MagicMock()
+            proj._CopyAndLinkFiles = mock.MagicMock()
+
+            proj.work_git = mock.MagicMock()
+            proj.work_git.GetHead.return_value = "refs/heads/topic"
+
+            proj.bare_ref = mock.MagicMock()
+            proj.bare_ref.all = {"refs/heads/topic": "5678abcd"}
+
+            branch = mock.MagicMock()
+            branch.name = "topic"
+            branch.LocalMerge = False
+            proj.GetBranch = mock.MagicMock(return_value=branch)
+
+            syncbuf = project.SyncBuffer(proj.config)
+            proj.Sync_LocalHalf(syncbuf, force_checkout=True)
+
+            proj._Checkout.assert_called_once_with(
+                "1234abcd", force_checkout=True, quiet=True
+            )
+            proj._CopyAndLinkFiles.assert_called_once_with()
+
     def test_sync_network_half_stateless_skips_if_stash(self):
         """Test stateless sync skips if stash exists."""
         with utils_for_test.TempGitTree() as tempdir: