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

Merge branch 'rs-simplify-changelog-branch_name' into 'master'
90c0f610 · Rémy Coutable · 141593fa · 614fcfc4 · 90c0f610
Commit 90c0f610 authored Dec 02, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

changelog bin/changelog +1 -1

No files found.
--- 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