Limit scope of --no-branch option in typeshed script (#20880)

cdce8p · web-flow · commit 6484430b9bce · 2026-02-23T19:23:51.000-08:00
Followup to #20873. Limit the `--no-branch` option to just the `git checkout` command. This fixes a small issue where `typeshed_patches` isn't defined with `--no-branch` selected. It's used later in the script as well.
diff --git a/misc/sync-typeshed.py b/misc/sync-typeshed.py
@@ -153,23 +153,20 @@ def main() -> None:
             raise ValueError("GITHUB_TOKEN environment variable must be set")
 
     with tempfile.TemporaryDirectory() as tmpdir:
-        if not args.no_branch:
-            # Stash patches before checking out a new branch
-            typeshed_patches = os.path.join("misc", "typeshed_patches")
-            tmp_patches = os.path.join(tmpdir, "typeshed_patches")
-            shutil.copytree(typeshed_patches, tmp_patches)
+        # Stash patches before checking out a new branch
+        typeshed_patches = os.path.join("misc", "typeshed_patches")
+        tmp_patches = os.path.join(tmpdir, "typeshed_patches")
+        shutil.copytree(typeshed_patches, tmp_patches)
 
-            branch_name = "mypybot/sync-typeshed"
+        branch_name = "mypybot/sync-typeshed"
+        if not args.no_branch:
             subprocess.run(["git", "checkout", "-B", branch_name, "origin/master"], check=True)
 
-            # Copy the stashed patches back
-            shutil.rmtree(typeshed_patches, ignore_errors=True)
-            shutil.copytree(tmp_patches, typeshed_patches)
-            if (
-                subprocess.run(["git", "diff", "--quiet", "--exit-code"], check=False).returncode
-                != 0
-            ):
-                subprocess.run(["git", "commit", "-am", "Update typeshed patches"], check=True)
+        # Copy the stashed patches back
+        shutil.rmtree(typeshed_patches, ignore_errors=True)
+        shutil.copytree(tmp_patches, typeshed_patches)
+        if subprocess.run(["git", "diff", "--quiet", "--exit-code"], check=False).returncode != 0:
+            subprocess.run(["git", "commit", "-am", "Update typeshed patches"], check=True)
 
         if not args.typeshed_dir:
             tmp_typeshed = os.path.join(tmpdir, "typeshed")
