git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4

From
PWPete Wyckoff <pw@padd.com>
Date
May 24, 2014, 13:52 UTC
Message-ID
<20140524135215.GA9386@padd.com>
In-Reply-To
<20140524013942.GA29751@nekage>
frrrwww@gmail.com wrote on Sat, 24 May 2014 02:39 +0100:
Show 13 quoted lines
> 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 <frrrwww@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 <pw@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
Previous: Maxime CosteNext: Maxime Coste
Message 7 of 13 in “git-p4: Do not include diff in spec file when just preparing p4”
  1. git-p4: Do not include diff in spec file when just preparing p4Maxime Coste, Jan 10, 2014
  2. Pete WyckoffJan 12, 2014
  3. Maxime CosteJan 13, 2014
  4. Pete WyckoffJan 14, 2014
  5. git-p4: Do not include diff in spec file when just preparing p4Maxime Coste, May 24, 2014
  6. Maxime CosteMay 24, 2014
  7. Pete WyckoffMay 24, 2014
  8. git-p4: Do not include diff in spec file when just preparing p4Maxime Coste, May 24, 2014
  9. Fix git-p4 submit in non --prepare-p4-only modeMaxime Coste, Jun 10, 2014
  10. Pete WyckoffJun 10, 2014
  11. Maxime CosteJun 11, 2014
  12. Pete WyckoffJun 11, 2014
  13. Fix git-p4 submit in non --prepare-p4-only modeMaxime Coste, Jun 11, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.