From: Jeff King <peff@peff.net>
Date: Wed, 05 Oct 2011 17:41:39 GMT
Subject: Re: git-cherry-pick and author field in version 1.7.6.4
Message-ID: <20111005174138.GA22962@sigill.intra.peff.net>
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