From: Neil Horman <nhorman@tuxdriver.com>
To: Chris Webb <chris@arachsys.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] cherry-pick: add --allow-empty-message option
Date: Mon, 6 Aug 2012 06:57:29 -0400 [thread overview]
Message-ID: <20120806105729.GC16873@hmsreliant.think-freely.org> (raw)
In-Reply-To: <86938f900c630d983852a250090f2aa6112fcc3c.1343903931.git.chris@arachsys.com>
On Thu, Aug 02, 2012 at 11:38:51AM +0100, Chris Webb wrote:
> Scripts such as git rebase -i cannot currently cherry-pick commits which
> have an empty commit message, as git cherry-pick calls git commit
> without the --allow-empty-message option.
>
> Add an --allow-empty-message option to git cherry-pick which is passed
> through to git commit, so this behaviour can be overridden.
>
> Signed-off-by: Chris Webb <chris@arachsys.com>
Sorry for the late response, but I just pulled back into town.
Having read over this thread, I think this is definately the way to go. As
discussed having cherry-pick stop and give the user a chance to fix empty
history messages by default, and providing a switch to override that behavior
makes sense to me. That said, shouldn't there be extra code here in the rebase
scripts to automate commit migration in that path as well?
Neil
>
next prev parent reply other threads:[~2012-08-06 10:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-01 11:16 Cherry-picking commits with empty messages Chris Webb
2012-08-01 17:52 ` Junio C Hamano
2012-08-01 18:15 ` Angus Hammond
2012-08-01 22:26 ` Junio C Hamano
2012-08-02 10:10 ` Angus Hammond
2012-08-02 8:55 ` Chris Webb
2012-08-02 10:38 ` [PATCH] cherry-pick: add --allow-empty-message option Chris Webb
2012-08-06 10:57 ` Neil Horman [this message]
2012-08-06 11:00 ` Chris Webb
2012-08-06 11:11 ` Neil Horman
2012-08-03 0:22 ` Cherry-picking commits with empty messages Neil Horman
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120806105729.GC16873@hmsreliant.think-freely.org \
--to=nhorman@tuxdriver.com \
--cc=chris@arachsys.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).