frrr...@gmail.com wrote on Sat, 24 May 2014 02:39 +0100:
> The diff information render the spec file unusable as is by p4,
> do not include it when run with --prepare-p4-only so that the
> given file can be directly passed to p4.
>
> With --prepare-p4-only, git-p4 already tells the user it can use
> p4 submit with the generated spec file. This fails because of the
> diff being present in the file. Not including the diff fixes that.
>
> Without --prepare-p4-only, keeping the diff makes sense for a
> quick review of the patch before submitting it. And does not cause
> problems with p4 as we remove it programmatically.
>
> Signed-off-by: Maxime Coste <frrr...@gmail.com>
Hi Maxime. This looks really good. Even the Windows section
is fine; thanks for paying attention there too.
I'm not particularly worried about having a new test for this.
Your tweak to the existing 9807 is fine. Unless of course you
have one ready to go.
Acked-by: Pete Wyckoff <p...@padd.com>
You might add my ack and send it directly to Junio + CC the list.
It'll be a nice improvement for the next available release.
-- 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
