git-cherry-pick and author field in version 1.7.6.4
Hi all,
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?
Regards,
Nicolas
Quoted 5 lines · Nicolas Dichtel
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 <[email protected]>' -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 <[email protected]>
1 files changed, 1 insertions(+), 0 deletions(-)
and the resulting commit looks good:
$ git log -1 --format='%an <%ae>' Other Person <[email protected]>
Does the script above work for you? If so, then what is different about your problematic case?
-Peff
Quoted 25 lines · Jeff King
Quoted 5 lines · Nicolas Dichtel
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<[email protected]>' -a -m other&& git tag other&& git reset --hard HEAD^&& git cherry-pick othergives this output for the cherry-pick:
[master 6eb207f] other
Author: Other Person<[email protected]> 1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 7 lines
and the resulting commit looks good:
$ git log -1 --format='%an<%ae>' Other Person<[email protected]>Does the script above work for you? If so, then what is different about your problematic case?
Here is my sequence. I'm in a linux tree with a remote that point to linus tree and I want to cherry-pick a patch from this remote:
# git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 [dev 87ce387] drivers/net/usb/asix.c: Fix unaligned accesses 1 files changed, 33 insertions(+), 1 deletions(-) # git log -1 --format='%an<%ae>' Nicolas Dichtel<[email protected]> # git log -1 --format='%an<%ae>' 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 Neil Jones<[email protected]> #
Maybe it is related to the problem I've reported in another thread:
http://comments.gmane.org/gmane.comp.version-control.git/182853
Regards,
Nicolas
Quoted 11 lines · Nicolas Dichtel
Here is my sequence. I'm in a linux tree with a remote that point to linus tree and I want to cherry-pick a patch from this remote:
# git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 [dev 87ce387] drivers/net/usb/asix.c: Fix unaligned accesses 1 files changed, 33 insertions(+), 1 deletions(-) # git log -1 --format='%an<%ae>' Nicolas Dichtel<[email protected]> # git log -1 --format='%an<%ae>' 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 Neil Jones<[email protected]> #
Hmph. Odd:
$ cd linux-2.6 $ git checkout -b dev 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9^ Switched to a new branch 'dev' $ git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 [dev 78929c2] drivers/net/usb/asix.c: Fix unaligned accesses Author: Neil Jones <[email protected]> 1 files changed, 33 insertions(+), 1 deletions(-) $ git log -1 --format='%an <%ae>' Neil Jones <[email protected]>
Quoted 2 lines
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.
You might also repeating the commands above. If it still fails, maybe try removing ".git/CHERRY_PICK_HEAD" if it exists and see if that helps.
-Peff
Quoted 16 lines · Jeff King
Quoted 11 lines · Nicolas Dichtel
Here is my sequence. I'm in a linux tree with a remote that point to linus tree and I want to cherry-pick a patch from this remote:
# git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 [dev 87ce387] drivers/net/usb/asix.c: Fix unaligned accesses 1 files changed, 33 insertions(+), 1 deletions(-) # git log -1 --format='%an<%ae>' Nicolas Dichtel<[email protected]> # git log -1 --format='%an<%ae>' 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 Neil Jones<[email protected]> #Hmph. Odd:
Quoted 9 lines
$ cd linux-2.6
$ git checkout -b dev 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9^
Switched to a new branch 'dev'
$ git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9
[dev 78929c2] drivers/net/usb/asix.c: Fix unaligned accesses
Author: Neil Jones<[email protected]>
1 files changed, 33 insertions(+), 1 deletions(-)
$ git log -1 --format='%an<%ae>'
Neil Jones<[email protected]># git checkout -b dev 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9^ Checking out files: 100% (25721/25721), done. Switched to a new branch 'dev' # git cherry-pick 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 [dev 693df4c] drivers/net/usb/asix.c: Fix unaligned accesses 1 files changed, 33 insertions(+), 1 deletions(-) # git log -1 --format='%an<%ae>' Nicolas Dichtel<[email protected]> #
Quoted 8 lines
Quoted 3 lines
Maybe it is related to the problem I've reported in another thread:
http://comments.gmane.org/gmane.comp.version-control.git/182853Possibly. 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.
Quoted 6 lines
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.
Quoted 3 lines
You might also repeating the commands above. If it still fails, maybe try removing ".git/CHERRY_PICK_HEAD" if it exists and see if that helps.
No, it just allow the commit --amend, but this will not change the author.
Regards,
Nicolas
Quoted 7 lines · Nicolas Dichtel
Quoted 7 lines
Quoted 2 lines
Maybe it is related to the problem I've reported in another thread:
http://comments.gmane.org/gmane.comp.version-control.git/182853Possibly. 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.
Quoted 7 lines
Quoted 6 lines
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.
-Peff
Quoted 15 lines · Jeff King
Quoted 13 lines · Nicolas Dichtel
Quoted 13 lines
Quoted 2 lines
Maybe it is related to the problem I've reported in another thread:
http://comments.gmane.org/gmane.comp.version-control.git/182853Possibly. 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.
Quoted 6 lines
Quoted 1 line
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_HEADcommit, 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