repo_roller: Expand _is_branch() conditions
Previously _is_branch() treated any string with a '/' as not a branch,
based on 'refs/tags/1.0.0'. However, many branches tracking a remote
repository use 'upstream/<branch name on remote repository>' or
something similar. Narrow this conditional to only match tags.
This caused http://go/bbid/8829012085064944593 to fail.
Change-Id: I6f24371065d784f1efc892462a317ed897889f7f
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/71660
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Marc-Antoine Ruel <maruel@google.com>
diff --git a/recipes/repo_roller.py b/recipes/repo_roller.py
index 76b4ce5..ab92d05 100644
--- a/recipes/repo_roller.py
+++ b/recipes/repo_roller.py
@@ -50,9 +50,7 @@
"""Return True if revision appears to be a branch name."""
if re.search(r'^[0-9a-fA-F]{40}$', revision):
return False
- if '/' in revision:
- return False
- return True
+ return not revision.startswith('refs/tags/')
# ElementTree orders attributes differently in Python 2 and 3, but if given
