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

2015-01-23 Thread Pete Wyckoff
l...@diamand.org wrote on Fri, 23 Jan 2015 09:15 +:
> 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 
> ---
>  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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2015-01-23 Thread Luke Diamand
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 http://vger.kernel.org/majordomo-info.html


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

2015-01-23 Thread Luke Diamand
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 
---
 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
 
-- 
2.1.3.1037.g95a6691.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html