tor-browser

commit b5c7de4a1d04670606ee14bedd1253f2a9f2d445
parent b6323dc4976f88b3c9100c4a25bda0236a05b5a9
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date:   Tue, 30 Dec 2025 23:28:21 +0000

Bug 2008043 - Fix base ref computation. r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D277666

Diffstat:
M
python/mozversioncontrol/mozversioncontrol/repo/git.py
 | 
12
++----------

1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/python/mozversioncontrol/mozversioncontrol/repo/git.py b/python/mozversioncontrol/mozversioncontrol/repo/git.py
@@ -129,17 +129,9 @@ class GitRepository(Repository):
             if is_official_remote(url):
                 yield name
 
-    def get_mozilla_remote_args(self) -> list[str]:
-        """Return a list of `--remotes` arguments to limit commits to official remotes."""
-        official_remotes = [
-            f"--remotes={remote}" for remote in self.get_mozilla_upstream_remotes()
-        ]
-
-        return official_remotes if official_remotes else ["--remotes"]
-
     @property
     def base_ref(self):
-        remote_args = self.get_mozilla_remote_args()
+        remote_args = self.get_mozilla_upstream_remotes()
 
         refs = self._run(
             "rev-list", "HEAD", "--topo-order", "--boundary", "--not", *remote_args
@@ -364,7 +356,7 @@ class GitRepository(Repository):
         follow: Optional[list[str]] = None,
     ) -> list[str]:
         """Return a list of commit SHAs for nodes on the current branch."""
-        remote_args = self.get_mozilla_remote_args()
+        remote_args = self.get_mozilla_upstream_remotes()
 
         cmd = [
             "log",