From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 06 Oct 2011 13:09:06 GMT
Subject: Re: git-cherry-pick and git-commit --amend in version 1.7.6.4
Message-ID: <CAG+J_DzY6oW3CgCPDhD81Eue1Ygh+3pR7Q_NZEhauH_qkyUwqQ@mail.gmail.com>
In-Reply-To: <4E8D5AD0.2040509@6wind.com>

On Thu, Oct 6, 2011 at 3:37 AM, Nicolas Dichtel
<nicolas.dichtel@6wind.com> wrote:
> # ls .git
> branches  COMMIT_EDITMSG  config  description  FETCH_HEAD  HEAD  hooks
>  index info  logs  objects  ORIG_HEAD  packed-refs  refs

No CHERRY_PICK_HEAD, so far so good.

> # git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
> [dev 4cca2c2] drivers/net/usb/asix.c: Fix unaligned accesses
>  1 files changed, 33 insertions(+), 1 deletions(-)

cherry-pick completes successfully.

> # ls .git
> branches  CHERRY_PICK_HEAD  COMMIT_EDITMSG  config  description  FETCH_HEAD
> HEAD  hooks  index  info  logs  objects  ORIG_HEAD  packed-refs  refs

This is bad. CHERRY_PICK_HEAD should only exist if the cherry-pick failed.

I really don't know what could cause this. Possibly a hook in your repo?

Using "GIT_TRACE=1 git cherry-pick
3f78d1f210ff89af77f042ab7f4a8fee39feb1c9" will tell you whether git is
running any hooks.

I can't think of anything config-wise that would cause this behavior.

I'll peer at the code some more...

j.