add review changes

Author: Shourya742

src/bootstrap/bootstrap.py

@@ -1163,47 +1163,35 @@ def build_triple(self):
         return config or default_build_triple(self.verbose)
 
     def is_git_repository(self, repo_path):
-        return (
-            subprocess.run(
-                ["git", "-C", repo_path, "rev-parse", "--is-inside-work-tree"],
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
-            ).returncode
-            == 0
-        )
+        return os.path.isdir(os.path.join(repo_path, ".git"))
 
-    def get_latest_commit(self, repo_path, branch, author_email):
+    def get_latest_commit(self, repo_path, author_email):
         try:
             if not self.is_git_repository(repo_path):
                 return "<commit>"
             cmd = [
                 "git",
                 "-C",
                 repo_path,
-                "log",
-                "--format=%H",
+                "rev-list",
                 "--author",
                 author_email,
-                branch,
-                "-n",
-                "1",
+                "-n1",
+                "HEAD",
             ]
             commit = subprocess.check_output(cmd, text=True).strip()
             return commit if commit else "<commit>"
         except subprocess.CalledProcessError:
             return "<commit>"
 
-    def get_values(self):
+    def get_value(self):
         file_path = f"{self.rust_root}/src/stage0"
-        print(file_path)
-        keys = ["git_merge_commit_email", "nightly_branch"]
-        values = []
+        target_key = "git_merge_commit_email"
         with open(file_path, "r") as file:
             for line in file:
-                for key in keys:
-                    if line.startswith(f"{key}="):
-                        values.append(line.split("=", 1)[1].strip())
-        return values
+                if line.startswith(f"{target_key}="):
+                    return line.split("=", 1)[1].strip()
+        return None
 
     def check_vendored_status(self):
         """Check that vendoring is configured properly"""
@@ -1218,12 +1206,9 @@ def check_vendored_status(self):
 
         cargo_dir = os.path.join(self.rust_root, ".cargo")
         repo_path = self.rust_root
-        git_merge_commit_email, nightly_branch = self.get_values()
-        commit = self.get_latest_commit(
-            repo_path, nightly_branch, git_merge_commit_email
-        )
+        git_merge_commit_email = self.get_value()
+        commit = self.get_latest_commit(repo_path, git_merge_commit_email)
         url = f"https://ci-artifacts.rust-lang.org/rustc-builds/{commit}/rustc-nightly-src.tar.xz"
-
         if self.use_vendored_sources:
             vendor_dir = os.path.join(self.rust_root, "vendor")
             if not os.path.exists(vendor_dir):