[git-users] cherry-picking modifies more than it should
Hi, I am seeing an unexpected effect of cherry-picking. I have two branches master and feature where feature branched off master awhile ago. I commit patch A to feature (in this case it was to Makefile.in) and then I cherry-picked A to master. There are a few conflicts in A code which I fix and commit. When I check the committed code I am amazed to see changes that didn't exist in A but did exist in feature. So, for some reason cherry-picking made some bits of code in master similar to feature that were not present in patch A. How can this happen? I thought have thought that this wouldn't be possible and cherry-picking would be more like a git format-patch + git apply with a nicer interface. Cheers, Paulo Matos -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: cherry-picking modifies more than it should
This is in git 1.8.1.3. On Monday, 7 October 2013 16:44:33 UTC+1, Paulo Matos wrote: Hi, I am seeing an unexpected effect of cherry-picking. I have two branches master and feature where feature branched off master awhile ago. I commit patch A to feature (in this case it was to Makefile.in) and then I cherry-picked A to master. There are a few conflicts in A code which I fix and commit. When I check the committed code I am amazed to see changes that didn't exist in A but did exist in feature. So, for some reason cherry-picking made some bits of code in master similar to feature that were not present in patch A. How can this happen? I thought have thought that this wouldn't be possible and cherry-picking would be more like a git format-patch + git apply with a nicer interface. Cheers, Paulo Matos -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] cherry-picking modifies more than it should
On 21/10/2013 19:19, Johan 't Hart wrote: You did git cherry-pick HEAD..A Instead of git cherry-pick A ? Or maybe the wrongly introduced code is around the conflict you resolved? No, I did git cherry-pick A and the wrongly introduced code is not around the conflict resolved. Actually the introduced code is not even part of the conflict. Current theory is that there's a bug in git 1.8.1. Will try latest release. I can reproduce this easily but unfortunately the used code if closed. I have contacted our IT dept. and they are looking at it. Cheers, -- Paulo Matos -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
