Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion etc/calc_release_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,12 @@ def iter_tag_lines():
the second is a tag that is associated with that commit. Duplicate commits
are possible.
"""
output = check_output(['git', 'tag', '--list', '--format=%(*objectname)|%(objectname)|%(refname:strip=2)'])
output = check_output(['git', 'for-each-ref', '--format=%(*objectname)|%(objectname)|%(refname:strip=2)', 'refs/tags/*'])
lines = output.splitlines()
for l in lines:
obj, tagobj, tag = l.split('|', 2)
if not tag.startswith('r'):
continue # We only care about "rX.Y.Z" release tags.
if re.match(r'r\d+\.\d+', tag):
yield obj, tagobj, tag

Expand Down
2 changes: 1 addition & 1 deletion etc/calc_release_version_selftest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ echo "Test next minor version ... begin"
# failed, then it is probably because a new major/minor release was made.
# Update the expected output to represent the correct next version.
# XXX NOTE XXX NOTE XXX
assert_eq "$got" "3.10.0-$DATE+git$CURRENT_SHORTREF"
assert_eq "$got" "4.1.0-$DATE+git$CURRENT_SHORTREF"
}
echo "Test next minor version ... end"

Expand Down