multi-workspace 3.2.14__tar.gz → 3.2.16__tar.gz

{multi_workspace-3.2.14 → multi_workspace-3.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: multi-workspace
-Version: 3.2.14
+Version: 3.2.16
 Summary: Multi
 Project-URL: Repository, https://github.com/gabemontague/multi
 Project-URL: Issues, https://github.com/gabemontague/multi/issues
@@ -37,6 +37,7 @@ Features:
 - Supports optional `installSets` so installer scripts can sync only a public/runtime subset of repos.
 - Optionally generates `CLAUDE.md` and `AGENTS.md` files from tracked `AGENTS.parts/*.md` files.
 - In monorepo mode, syncs sub-repo GitHub workflows into root `.github/workflows`.
+- Pairs with Multi Desktop for workspace diffs, branch visibility, and actionable push diagnostics.
 
 ## Installation
 

{multi_workspace-3.2.14 → multi_workspace-3.2.16}/README.md

@@ -10,6 +10,7 @@ Features:
 - Supports optional `installSets` so installer scripts can sync only a public/runtime subset of repos.
 - Optionally generates `CLAUDE.md` and `AGENTS.md` files from tracked `AGENTS.parts/*.md` files.
 - In monorepo mode, syncs sub-repo GitHub workflows into root `.github/workflows`.
+- Pairs with Multi Desktop for workspace diffs, branch visibility, and actionable push diagnostics.
 
 ## Installation
 

{multi_workspace-3.2.14 → multi_workspace-3.2.16}/multi/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.2.14'
-__version_tuple__ = version_tuple = (3, 2, 14)
+__version__ = version = '3.2.16'
+__version_tuple__ = version_tuple = (3, 2, 16)
 
 __commit_id__ = commit_id = None

{multi_workspace-3.2.14 → multi_workspace-3.2.16}/multi/sync.py

@@ -109,10 +109,29 @@ def _clone_repo(
     ) as temp_dir:
         temp_repo_path = Path(temp_dir) / repo_config.name
 
-        # First clone the default branch outside the workspace, then move the
-        # checked-out repo into place. This avoids checkout conflicts when the
-        # workspace root gitignore already manages sub-repo paths.
-        cloned_repo = git.Repo.clone_from(repo_config.url, temp_repo_path)
+        # First clone outside the workspace, then move the checked-out repo
+        # into place. This avoids checkout conflicts when the workspace root
+        # gitignore already manages sub-repo paths.
+        clone_kwargs = {}
+        if expected_branch:
+            clone_kwargs = {"branch": expected_branch, "single_branch": True}
+
+        try:
+            cloned_repo = git.Repo.clone_from(
+                repo_config.url,
+                temp_repo_path,
+                **clone_kwargs,
+            )
+        except GitCommandError:
+            if not expected_branch:
+                raise
+
+            # Preserve the historical fallback for repos that do not have the
+            # mirrored branch: clone whatever the remote default is, then warn
+            # below when checkout cannot find the expected branch.
+            if temp_repo_path.exists():
+                shutil.rmtree(temp_repo_path)
+            cloned_repo = git.Repo.clone_from(repo_config.url, temp_repo_path)
 
         # Then checkout the expected branch if one is defined for this repo.
         if expected_branch: