From: Luke Diamand <luke@diamand.org>
Date: Fri, 23 Jan 2015 09:15:12 +0000 (+0000)
Subject: git-p4: correct --prepare-p4-only instructions
X-Git-Tag: v2.4.0-rc0~140^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10de86d0d57dfa6680e229bfa0aa8ed31382767e

git-p4: correct --prepare-p4-only instructions

If you use git-p4 with the "--prepare-p4-only" option, then
it prints the p4 command line to use. However, the command
line was incorrect: the changelist specification must be
supplied on standard input, not as an argument to p4.

Signed-off-by: Luke Diamand <luke@diamand.org>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-p4.py b/git-p4.py
index ff132b2117..90447de6a1 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1442,7 +1442,7 @@ def applyCommit(self, id):
             print "  " + self.clientPath
             print
             print "To submit, use \"p4 submit\" to write a new description,"
-            print "or \"p4 submit -i %s\" to use the one prepared by" \
+            print "or \"p4 submit -i <%s\" to use the one prepared by" \
                   " \"git p4\"." % fileName
             print "You can delete the file \"%s\" when finished." % fileName