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 313f1a7da394c6bb4e896dbb7bf214b7400e8613..6ff76def4dd210e191bef3de6a5c2772f36c9dd4 100644 (file)
--- 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 44098d28d70201689b014f5206616ee1fca4e873..da889865b49bda243eb5ced404f4d0eed0b602c0 100644 (file)
--- 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}