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
2016-12-02 12:31:12 +00:00 · 2016-12-02 12:31:12 +00:00 · 90c0f610e2
commit 90c0f610e2
parent 141593fa71 614fcfc4df
1 changed files with 1 additions and 1 deletions
--- a/bin/changelog
+++ b/bin/changelog
@ -158,7 +158,7 @@ class ChangelogEntry
  end

  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