git-p4: correct --prepare-p4-only instructions
authorLuke Diamand <luke@diamand.org>
Fri, 23 Jan 2015 09:15:12 +0000 (09:15 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Jan 2015 22:44:14 +0000 (14:44 -0800)
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>
git-p4.py
index ff132b2117c5ed7529d6b1237a9f26069cb4ef8a..90447de6a1fece922d1f6ccfecc3e92e92537da5 100755 (executable)
--- 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