Show full branch name (standard case when branch name looks like feature/use-jquery-1.6.3)

akzhan · akzhan · commit 9083f97af0c2 · 2011-09-05T15:25:04.000+04:00
diff --git a/lib/git_commit_notifier/commit_hook.rb b/lib/git_commit_notifier/commit_hook.rb
@@ -63,7 +63,11 @@ def run(config_name, rev1, rev2, ref_name)
         logger.debug("included branches: #{include_branches.join(', ')}") unless include_branches.nil?
 
         prefix = config["emailprefix"] || Git.repo_name
-        branch_name = ref_name.split("/").last
+        branch_name = if ref_name =~ /^refs\/heads\/(.+)$/
+          $1
+        else
+          ref_name.split("/").last
+        end
 
         logger.debug("prefix: #{prefix}")
         logger.debug("branch: #{branch_name}")
@@ -74,7 +78,7 @@ def run(config_name, rev1, rev2, ref_name)
         end
 
         branch_name = "/#{branch_name}"
-        branch_name = "" if !config["show_master_branch_name"] && branch_name.eql?('/master')
+        branch_name = "" if !config["show_master_branch_name"] && branch_name == '/master'
 
         info("Sending mail...")
 
