From: James Moger <james.moger@gitblit.com>
Date: Sun, 9 Mar 2014 16:38:31 +0000 (-0400)
Subject: Fixed incorrect ticket fetch instructions in email notifications
X-Git-Tag: v1.4.1~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=328346fbed4c620cd0ad675ab03551d9790fb3e3;p=gitblit.git

Fixed incorrect ticket fetch instructions in email notifications
---

diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 313f1a7d..6ff76def 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -489,6 +489,7 @@ public class TicketNotifier {
 		instructions = instructions.replace("${ticketRef}", ticketBranch);
 		instructions = instructions.replace("${patchsetRef}", patchsetBranch);
 		instructions = instructions.replace("${reviewBranch}", reviewBranch);
+		instructions = instructions.replace("${ticketBranch}", ticketBranch);
 
 		return instructions;
 	}
diff --git a/src/main/java/com/gitblit/tickets/commands.md b/src/main/java/com/gitblit/tickets/commands.md
index 44098d28..da889865 100644
--- a/src/main/java/com/gitblit/tickets/commands.md
+++ b/src/main/java/com/gitblit/tickets/commands.md
@@ -2,10 +2,10 @@
 
 To review an updated patchset
 
-    git fetch && git checkout ${reviewBranch} && git pull --ff-only
+    git fetch && git checkout ${ticketBranch} && git pull --ff-only
 
 To review a rewritten patchset
 
-    git fetch && git checkout ${reviewBranch} && git reset --hard origin/${reviewBranch}
+    git fetch && git checkout ${ticketBranch} && git reset --hard origin/${ticketBranch}