| Index: tools/push-to-trunk/common_includes.py
|
| diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py
|
| index ed3b1fa62535615e8b4bd3d6845e842b76b854b6..e2bfdd5988789959cc892959cef10449f798d488 100644
|
| --- a/tools/push-to-trunk/common_includes.py
|
| +++ b/tools/push-to-trunk/common_includes.py
|
| @@ -375,12 +375,12 @@ class GitTagsOnlyMixin(VCInterface):
|
| return self.step.Git("tag").strip().splitlines()
|
|
|
| def GetBranches(self):
|
| - # Get relevant remote branches, e.g. "origin/branch-heads/3.25".
|
| + # Get relevant remote branches, e.g. "branch-heads/3.25".
|
| branches = filter(
|
| - lambda s: re.match(r"^origin/branch\-heads/\d+\.\d+$", s),
|
| + lambda s: re.match(r"^branch\-heads/\d+\.\d+$", s),
|
| self.step.GitRemotes())
|
| - # Remove 'origin/branch-heads/' prefix.
|
| - return map(lambda s: s[20:], branches)
|
| + # Remove 'branch-heads/' prefix.
|
| + return map(lambda s: s[13:], branches)
|
|
|
| def MasterBranch(self):
|
| return "master"
|
|
|