Fixed sendmail.groovy branch/tag labeling

diff --git a/groovy/sendmail.groovy b/groovy/sendmail.groovy
index 0b60dfad9801cac3c087f7d18924ef202c116d1f..73a25e57ec23e8083d84742434710a9bed63210f 100644 (file)
--- a/groovy/sendmail.groovy
+++ b/groovy/sendmail.groovy
@@ -122,34 +122,28 @@ SimpleDateFormat df = new SimpleDateFormat(gitblit.getString(Keys.web.datetimest
 def table = { "\n ${JGitUtils.getDisplayName(it.authorIdent)}\n ${df.format(JGitUtils.getCommitDate(it))}\n\n $it.shortMessage\n\n $commitUrl$it.id.name" }\r
 for (command in commands) {\r
        def ref = command.refName\r
+       def refType = 'branch'\r
        if (ref.startsWith('refs/heads/')) {\r
                ref  = command.refName.substring('refs/heads/'.length())\r
        } else if (ref.startsWith('refs/tags/')) {\r
                ref  = command.refName.substring('refs/tags/'.length())\r
+               refType = 'tag'\r
        }\r
                \r
        switch (command.type) {\r
                case ReceiveCommand.Type.CREATE:\r
                        def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name).reverse()\r
                        commitCount += commits.size()\r
-                       if (commits.size() > 0) {\r
-                               // new branch\r
-                               changes += "\n$branchBreak new branch $ref created ($commits.size commits)\n$branchBreak"\r
-                               changes += commits.collect(table).join(commitBreak)\r
-                               changes += '\n'\r
-                       } else if (ref.command.refName.startsWith('refs/tags/')) {\r
-                               // new tag\r
-                               changes += "\n$branchBreak new tag $ref created\n$branchBreak"\r
-                       } else if (ref.command.refName.startsWith('refs/heads/')) {\r
-                               // new branch\r
-                               changes += "\n$branchBreak new $ref branch created\n$branchBreak"\r
-                       }\r
+                       // new branch\r
+                       changes += "\n$branchBreak new $refType $ref created ($commits.size commits)\n$branchBreak"\r
+                       changes += commits.collect(table).join(commitBreak)\r
+                       changes += '\n'\r
                        break\r
                case ReceiveCommand.Type.UPDATE:\r
                        def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name).reverse()\r
                        commitCount += commits.size()\r
                        // fast-forward branch commits table\r
-                       changes += "\n$branchBreak $ref branch updated ($commits.size commits)\n$branchBreak"\r
+                       changes += "\n$branchBreak $ref $refType updated ($commits.size commits)\n$branchBreak"\r
                        changes += commits.collect(table).join(commitBreak)\r
                        changes += '\n'\r
                        break\r
@@ -157,13 +151,13 @@ for (command in commands) {
                        def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name).reverse()\r
                        commitCount += commits.size()\r
                        // non-fast-forward branch commits table\r
-                       changes += "\n$branchBreak $ref branch updated [NON fast-forward] ($commits.size commits)\n$branchBreak"\r
+                       changes += "\n$branchBreak $ref $refType updated [NON fast-forward] ($commits.size commits)\n$branchBreak"\r
                        changes += commits.collect(table).join(commitBreak)\r
                        changes += '\n'\r
                        break\r
                case ReceiveCommand.Type.DELETE:\r
                        // deleted branch/tag\r
-                       changes += "\n$branchBreak $ref deleted\n$branchBreak"\r
+                       changes += "\n$branchBreak $ref $refType deleted\n$branchBreak"\r
                        break\r
                default:\r
                        break\r