* [PATCH] git-p4: correct --prepare-p4-only instructions
@ 2015-01-23 9:15 Luke Diamand
2015-01-23 9:15 ` Luke Diamand
0 siblings, 1 reply; 3+ messages in thread
From: Luke Diamand @ 2015-01-23 9:15 UTC (permalink / raw)
To: git; +Cc: Pete Wyckoff, 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 <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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] git-p4: correct --prepare-p4-only instructions
2015-01-23 9:15 [PATCH] git-p4: correct --prepare-p4-only instructions Luke Diamand
@ 2015-01-23 9:15 ` Luke Diamand
2015-01-23 21:39 ` Pete Wyckoff
0 siblings, 1 reply; 3+ messages in thread
From: Luke Diamand @ 2015-01-23 9:15 UTC (permalink / raw)
To: git; +Cc: Pete Wyckoff, 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 <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
--
2.1.3.1037.g95a6691.dirty
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] git-p4: correct --prepare-p4-only instructions
2015-01-23 9:15 ` Luke Diamand
@ 2015-01-23 21:39 ` Pete Wyckoff
0 siblings, 0 replies; 3+ messages in thread
From: Pete Wyckoff @ 2015-01-23 21:39 UTC (permalink / raw)
To: Luke Diamand; +Cc: git
luke@diamand.org wrote on Fri, 23 Jan 2015 09:15 +0000:
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-23 21:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-23 9:15 [PATCH] git-p4: correct --prepare-p4-only instructions Luke Diamand
2015-01-23 9:15 ` Luke Diamand
2015-01-23 21:39 ` Pete Wyckoff
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.