setup.py: drop assumption about local main branch (#14692)

Signed-off-by: Russell Bryant <rbryant@redhat.com>

setup.py

@@ -294,26 +294,28 @@ class repackage_wheel(build_ext):
             ]).decode("utf-8")
             upstream_main_commit = json.loads(resp_json)["sha"]
 
-            # Check if the local main branch is up-to-date. This is to ensure
+            # Check if the upstream_main_commit exists in the local repo
-            # the base commit we found is the most recent commit on the main
+            try:
-            # branch.
+                subprocess.check_output(
-            local_main_commit = subprocess.check_output(
+                    ["git", "cat-file", "-e", f"{upstream_main_commit}"])
-                ["git", "rev-parse", "main"]).decode("utf-8").strip()
+            except subprocess.CalledProcessError:
-            if local_main_commit != upstream_main_commit:
+                # If not present, fetch it from the remote repository.
-                raise ValueError(
+                # Note that this does not update any local branches,
-                    f"Local main branch ({local_main_commit}) is not "
+                # but ensures that this commit ref and its history are
-                    "up-to-date with upstream main branch "
+                # available in our local repo.
-                    f"({upstream_main_commit}). Please pull the latest "
+                subprocess.check_call([
-                    "changes from upstream main branch first.")
+                    "git", "fetch", "https://github.com/vllm-project/vllm",
+                    "main"
+                ])
 
             # Then get the commit hash of the current branch that is the same as
             # the upstream main commit.
             current_branch = subprocess.check_output(
                 ["git", "branch", "--show-current"]).decode("utf-8").strip()
 
-            base_commit = subprocess.check_output(
+            base_commit = subprocess.check_output([
-                ["git", "merge-base", "main",
+                "git", "merge-base", f"{upstream_main_commit}", current_branch
-                 current_branch]).decode("utf-8").strip()
+            ]).decode("utf-8").strip()
             return base_commit
         except ValueError as err:
             raise ValueError(err) from None