threads / patch / 38440

patchgit-p4: correct --prepare-p4-only instructions

Subject: [PATCH] git-p4: correct --prepare-p4-only instructions

## tl;dr

3 messages between Jan 23, 2015 and Jan 23, 2015. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Luke Diamand· Jan 23, 2015, 09:15 UTC · lore

This fixes a small error in the command that git-p4 suggests when the user gives the --prepare-p4-only option.

It tells the user to use "p4 submit -i filename" but the p4 submit command reads a change specification on standard input. The correct command line is therefore:

   p4 submit -i <filename

Luke Diamand (1):
  git-p4: correct --prepare-p4-only instructions

 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.1.3.1037.g95a6691.dirty

Luke Diamand· Jan 23, 2015, 09:15 UTC · re: Luke Diamand · lore

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>
---
 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to git-p4.py +1 −1

diff --git a/git-p4.py b/git-p4.py
index ff132b2..90447de 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1442,7 +1442,7 @@ class P4Submit(Command, P4UserMap):
             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

-- 
2.1.3.1037.g95a6691.dirty

Pete Wyckoff· Jan 23, 2015, 21:39 UTC · re: Luke Diamand · lore

Re: [PATCH] git-p4: correct --prepare-p4-only instructions

luke@diamand.org wrote on Fri, 23 Jan 2015 09:15 +0000:

Show 23 quoted lines

> 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>
> ---
>  git-p4.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/git-p4.py b/git-p4.py
> index ff132b2..90447de 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -1442,7 +1442,7 @@ class P4Submit(Command, P4UserMap):
>              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
>

Looks obviously good here.  Ack!

		-- Pete