From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: git-cherry-pick and author field in version 1.7.6.4
Date: Thu, 06 Oct 2011 15:34:15 +0200 [thread overview]
Message-ID: <4E8DAE57.60705@6wind.com> (raw)
In-Reply-To: <20111006132646.GB1792@sigill.intra.peff.net>
Le 06/10/2011 15:26, Jeff King a écrit :
> On Thu, Oct 06, 2011 at 02:37:02PM +0200, Nicolas Dichtel wrote:
>
>>>> Maybe it is related to the problem I've reported in another thread:
>>>> http://comments.gmane.org/gmane.comp.version-control.git/182853
>>>
>>> Possibly. That issue is about the commit that comes _after_ the
>>> cherry-pick, and in this instance, things are already wrong for you by
>>> the time the cherry-pick has completed.
>>>
>>> However, the problem has to do with leaving a stale state file in .git,
>>> so perhaps a previous partially-completed cherry-pick has left cruft in
>>> .git that is confusing this cherry-pick (i.e., I can't reproduce because
>>> it is being affected by something that happened before the commands
>>> above). So let's see what Jay comes up with for solving the other
>>> problem, and I suspect it may just fix this issue, too.
>> I think so too. Will wait.
>
> Since you can reproduce this so readily, and since you said it seems to
> work with older versions of git, you might try bisecting. There's a
> reasonable chance it will just end up at Jay's CHERRY_PICK_HEAD commit,
> but it might be worth doing.
I've try with another user on the same host and it works, so I end up to my
environment config ... and it's my fault: I've some variables set (GITPERLLIB
and GIT_EXEC_PATH) that point to an older git version.
Now it works, sorry for the noise!
The second pb, about the author is fixed too.
Regards,
Nicolas
prev parent reply other threads:[~2011-10-06 13:34 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
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 [this message]
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=4E8DAE57.60705@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.