git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pete Wyckoff <pw@padd.com>
To: Maxime Coste <frrrwww@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4
Date: Sat, 24 May 2014 09:52:15 -0400	[thread overview]
Message-ID: <20140524135215.GA9386@padd.com> (raw)
In-Reply-To: <20140524013942.GA29751@nekage>

frrrwww@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 <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

  parent reply	other threads:[~2014-05-24 13:52 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-10 18:18 [PATCH] git-p4: Do not include diff in spec file when just preparing p4 Maxime Coste
2014-01-12 22:29 ` Pete Wyckoff
2014-01-13 12:10   ` Maxime Coste
2014-01-14  0:06     ` Pete Wyckoff
2014-05-24  1:39       ` Maxime Coste
2014-05-24  1:44         ` Maxime Coste
2014-05-24 13:52         ` Pete Wyckoff [this message]
2014-05-24 17:40           ` Maxime Coste
2014-06-10 12:14             ` [PATCH] Fix git-p4 submit in non --prepare-p4-only mode Maxime Coste
2014-06-10 22:39               ` Pete Wyckoff
2014-06-11 13:06                 ` Maxime Coste
2014-06-11 13:36                   ` Pete Wyckoff
2014-06-11 13:09                 ` Maxime Coste

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140524135215.GA9386@padd.com \
    --to=pw@padd.com \
    --cc=frrrwww@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).