From: Maxime Coste <frrrwww@gmail.com>
To: Pete Wyckoff <pw@padd.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4
Date: Mon, 13 Jan 2014 12:10:11 +0000 [thread overview]
Message-ID: <20140113121011.GA9711@nekage> (raw)
In-Reply-To: <20140112222946.GA13519@padd.com>
Hello,
On Sun, Jan 12, 2014 at 05:29:46PM -0500, Pete Wyckoff wrote:
> Thanks for the patch, but I'm curious how you'd like this to
> work. I never use the option myself.
>
> As it is, --prepare-p4-only generates a file in /tmp/ that has
> exactly the contents you'd see in the editor during "git p4
> submit". It includes the diff of the change, presumably to help
> with writing the description.
Yes, I believe it makes sense to display the diff in this case, as we
can remove it later programmatically.
> Now you can't actually feed this file directly to "p4 submit"
> without deleting the diff. That's the part you don't like?
Yes, I do not use that for submitting, but for shelving. I can run
git p4 submit --prepare-p4-only followed by p4 shelve -i < /tmp/...
and perforce will shelve the corresponding change.
Removing the diff could be done externally, however git-p4 itself
tells the user it can submit using the generated file, which is
not the case if we keep the diff in it.
Cheers,
Maxime Coste.
next prev parent reply other threads:[~2014-01-13 12:08 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 [this message]
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
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=20140113121011.GA9711@nekage \
--to=frrrwww@gmail.com \
--cc=git@vger.kernel.org \
--cc=pw@padd.com \
/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).