Commit 90c0f610 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rs-simplify-changelog-branch_name' into 'master'

Simplify `branch_name` in bin/changelog

The `--short` option has existed since at least 1.8.1:
https://git-scm.com/docs/git-symbolic-ref/1.8.1

See merge request !7891
parents 141593fa 614fcfc4
...@@ -158,7 +158,7 @@ class ChangelogEntry ...@@ -158,7 +158,7 @@ class ChangelogEntry
end end
def branch_name def branch_name
@branch_name ||= %x{git symbolic-ref HEAD}.strip.sub(%r{\Arefs/heads/}, '') @branch_name ||= %x{git symbolic-ref --short HEAD}.strip
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment