Clarify ticket fetch instructions

diff --git a/src/main/java/com/gitblit/tickets/commands.md b/src/main/java/com/gitblit/tickets/commands.md
index da889865b49bda243eb5ced404f4d0eed0b602c0..87fe515c017ff346211fb68bfe34fb8b55a52876 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 ${ticketBranch} && git pull --ff-only
+    git fetch origin && git checkout ${ticketBranch} && git pull --ff-only
 
 To review a rewritten patchset
 
-    git fetch && git checkout ${ticketBranch} && git reset --hard origin/${ticketBranch}
+    git fetch origin && git checkout ${ticketBranch} && git reset --hard origin/${ticketBranch}
 
 

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 569818fe9bed93792de63af703d3928bd099d681..80b55766c622a21c51e3648232b12a72686a08c0 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -1203,8 +1203,8 @@ public class TicketPage extends TicketBasePage {
                };\r
                panel.add(pathsView);\r
 \r
-               addPtReviewInstructions(user, repository, panel);\r
-               addGitReviewInstructions(user, repository, panel);\r
+               addPtCheckoutInstructions(user, repository, panel);\r
+               addGitCheckoutInstructions(user, repository, panel);\r
                panel.add(createMergePanel(user, repository));\r
 \r
                return panel;\r
@@ -1278,13 +1278,13 @@ public class TicketPage extends TicketBasePage {
                return x;\r
        }\r
 \r
-       protected void addGitReviewInstructions(UserModel user, RepositoryModel repository, MarkupContainer panel) {\r
+       protected void addGitCheckoutInstructions(UserModel user, RepositoryModel repository, MarkupContainer panel) {\r
                panel.add(new Label("gitStep1", MessageFormat.format(getString("gb.stepN"), 1)));\r
                panel.add(new Label("gitStep2", MessageFormat.format(getString("gb.stepN"), 2)));\r
 \r
                String ticketBranch  = Repository.shortenRefName(PatchsetCommand.getTicketBranch(ticket.number));\r
 \r
-               String step1 = "git fetch";\r
+               String step1 = "git fetch origin";\r
                String step2 = MessageFormat.format("git checkout {0} && git pull --ff-only\nOR\ngit checkout {0} && git reset --hard origin/{0}", ticketBranch);\r
 \r
                panel.add(new Label("gitPreStep1", step1));\r
@@ -1294,7 +1294,7 @@ public class TicketPage extends TicketBasePage {
                panel.add(createCopyFragment("gitCopyStep2", step2.replace("\n", " && ")));\r
        }\r
 \r
-       protected void addPtReviewInstructions(UserModel user, RepositoryModel repository, MarkupContainer panel) {\r
+       protected void addPtCheckoutInstructions(UserModel user, RepositoryModel repository, MarkupContainer panel) {\r
                String step1 = MessageFormat.format("pt checkout {0,number,0}", ticket.number);\r
                panel.add(new Label("ptPreStep", step1));\r
                panel.add(createCopyFragment("ptCopyStep", step1));\r