Fix close ticket on push by commit message parsing (issue-404)

diff --git a/releases.moxie b/releases.moxie
index 0c5299e539f1eed6159c5bea8c62db906e13637c..6227ce5b3faf6ec87bec4706012d2b855173da0b 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@ r22: {
     security: ~
     fixes:
     - Repository mailing lists could not be reset from the Edit Repository page (issue-399)
+    - Fix closing ticket on push by parsing commit messages for closes|fixes (issue-404)
     - Ensure the Lucene ticket index is updated on repository deletion.
     changes:
     - Option to allow LDAP users to directly authenticate without performing LDAP searches (pr-162))

diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
index 3ec3086a0f23979127cb73dd9cb65a08018f44cf..1d3312aa6ab2b72b7f7d12e789e5a8923fb134a4 100644 (file)
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -775,6 +775,9 @@ public class PatchsetReceivePack extends GitblitReceivePack {
                                }\r
 \r
                                TicketModel ticket = ticketService.getTicket(repository, ticketNumber);\r
+                               if (ticket == null) {\r
+                                       continue;\r
+                               }\r
                                String integrationBranch;\r
                                if (StringUtils.isEmpty(ticket.mergeTo)) {\r
                                        // unspecified integration branch\r
@@ -897,7 +900,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
                        Pattern p = Pattern.compile("(?:fixes|closes)[\\s-]+#?(\\d+)", Pattern.CASE_INSENSITIVE);\r
                        Matcher m = p.matcher(commit.getFullMessage());\r
                        while (m.find()) {\r
-                               String val = m.group();\r
+                               String val = m.group(1);\r
                                return Long.parseLong(val);\r
                        }\r
                }\r