Re: git-cherry-pick and git-commit --amend in version 1.7.6.4

[Nicolas Dichtel <nicolas.dichtel@6wind.com>]

Le 06/10/2011 09:37, Nicolas Dichtel a écrit :
> Le 05/10/2011 18:50, Jay Soffian a écrit :
>> On Wed, Oct 5, 2011 at 10:52 AM, Nicolas Dichtel
>> <nicolas.dichtel@6wind.com> wrote:
>>> Hi,
>>>
>>> still with version 1.7.6.4, when I do a cherry-pick, that succeeded, I
>>> cannot do a commit --amend after:
>>>
>>> # git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
>>> [dev 1a04a23] drivers/net/usb/asix.c: Fix unaligned accesses
>>> 1 files changed, 33 insertions(+), 1 deletions(-)
>>> # echo $?
>>> 0
>>> # git commit --amend
>>> fatal: You are in the middle of a cherry-pick -- cannot amend.
>>> #
>>>
>>> The same operations (with the same patch), with version 1.7.3.4 is ok.
>>
>> Please do the following with 1.7.6.4:
>>
>> # ls .git
>> # git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
>> # ls .git
>> # git cat-file -p 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
>> # git cat-file -p HEAD
>>
>> And send the transcript.
> Here is:
>
> # ls .git
> branches COMMIT_EDITMSG config description FETCH_HEAD HEAD hooks index info logs
> objects ORIG_HEAD packed-refs refs
> # git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
> [dev 4cca2c2] drivers/net/usb/asix.c: Fix unaligned accesses
> 1 files changed, 33 insertions(+), 1 deletions(-)
> # ls .git
> branches CHERRY_PICK_HEAD COMMIT_EDITMSG config description FETCH_HEAD HEAD
> hooks index info logs objects ORIG_HEAD packed-refs refs
> # git cat-file -p 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
> tree f29742a1a73c27a88c7ac701a7a06ac1c2f7973a
> parent e7a3af5d8cd782b84e6ca4e4dcc8613be1a809f0
> author Neil Jones <NeilJay@gmail.com> 1274141908 -0700
> committer David S. Miller <davem@davemloft.net> 1274141908 -0700
>
> drivers/net/usb/asix.c: Fix unaligned accesses
>
> Using this driver can cause unaligned accesses in the IP layer
> This has been fixed by aligning the skb data correctly using the
> spare room left over by the 4 byte header inserted between packets
> by the device.
>
> Signed-off-by: Neil Jones <NeilJay@gmail.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> # git cat-file -p HEAD
> tree 282b6492d9d5bcf1c3718420c6f31ca2033ca5cb
> parent c8054f854773e65d8592f2ef35939ec2ae8b01df
> author Nicolas Dichtel <nicolas.dichtel@6wind.com> 1317886553 +0200
> committer Nicolas Dichtel <nicolas.dichtel@6wind.com> 1317886553 +0200
>
> drivers/net/usb/asix.c: Fix unaligned accesses
>
> Using this driver can cause unaligned accesses in the IP layer
> This has been fixed by aligning the skb data correctly using the
> spare room left over by the 4 byte header inserted between packets
> by the device.
>
> Signed-off-by: Neil Jones <NeilJay@gmail.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> #
>
There is another symptom, describe in this thread:
http://comments.gmane.org/gmane.comp.version-control.git/182852

Maybe the two problems are related.


Regards,
Nicolas