From 328346fbed4c620cd0ad675ab03551d9790fb3e3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 09 Mar 2014 12:38:31 -0400
Subject: [PATCH] Fixed incorrect ticket fetch instructions in email notifications
---
src/main/java/com/gitblit/tickets/commands.md | 4 ++--
src/main/java/com/gitblit/tickets/TicketNotifier.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 313f1a7..6ff76de 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -489,6 +489,7 @@
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 44098d2..da88986 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}
--
Gitblit v1.9.1