From: Jeff King <peff@peff.net>
To: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Cc: git@vger.kernel.org
Subject: Re: git-cherry-pick and author field in version 1.7.6.4
Date: Wed, 5 Oct 2011 13:41:39 -0400 [thread overview]
Message-ID: <20111005174138.GA22962@sigill.intra.peff.net> (raw)
In-Reply-To: <4E8C6F0E.7000508@6wind.com>
On Wed, Oct 05, 2011 at 04:51:58PM +0200, Nicolas Dichtel wrote:
> in the last stable version (1.7.6.4), when I perform a
> git-cherry-pick, the initial author of the patch is erased whith my
> name (it was not the case in version 1.7.3.4 and prior). Is this
> behavior intended ? Is there an option to keep the initial author of
> the patch?
I can't reproduce your problem:
git init repo &&
cd repo &&
echo content >file && git add file && git commit -m base &&
echo changes >>file &&
git commit --author='Other Person <other@example.com>' -a -m other &&
git tag other &&
git reset --hard HEAD^ &&
git cherry-pick other
gives this output for the cherry-pick:
[master 6eb207f] other
Author: Other Person <other@example.com>
1 files changed, 1 insertions(+), 0 deletions(-)
and the resulting commit looks good:
$ git log -1 --format='%an <%ae>'
Other Person <other@example.com>
Does the script above work for you? If so, then what is different about
your problematic case?
-Peff
next prev parent reply other threads:[~2011-10-05 17:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-05 14:51 git-cherry-pick and author field in version 1.7.6.4 Nicolas Dichtel
2011-10-05 17:41 ` Jeff King [this message]
2011-10-06 7:51 ` Nicolas Dichtel
2011-10-06 11:27 ` Jeff King
2011-10-06 12:37 ` Nicolas Dichtel
2011-10-06 13:26 ` Jeff King
2011-10-06 13:34 ` Nicolas Dichtel
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=20111005174138.GA22962@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=nicolas.dichtel@6wind.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).