On Thu, Oct 6, 2011 at 3:37 AM, Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html