Re: [git-users] help, why the same commit in one branch
On Thu, Mar 21, 2013 at 1:47 AM, Dale R. Worley wor...@alum.mit.edu wrote: From: lei yang yanglei.f...@gmail.com I git clone git:// git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git find v3.7-rc1 has two same commit ,can some one give me a detailed explanation ? I see that two different commits, 33e1af... and efda0a... have very similar commit comments, the same Author, and the same Date. But one includes the line Acked-by: Amit Shah amit.s...@redhat.com. I suspect that the two commits have very different changes to the file base. Perhaps one is intended to be an amendment to the other? One documents a verification of the other? The have the same contents. Lei Dale lyang001@lyang001-OptiPlex-9010:~/trees/linux-stable$ git log v3.7-rc1 -G registering virtio driver commit 33e1afc3d82697599ccc8dc8f2fa445ae329 Author: Alexey Khoroshilov khoroshi...@ispras.ru Date: Sat Sep 1 23:49:37 2012 +0400 virtio: console: fix error handling in init() function If register_virtio_driver() fails, virtio-ports class is not destroyed. The patch adds error handling of register_virtio_driver(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov khoroshi...@ispras.ru Acked-by: Amit Shah amit.s...@redhat.com Signed-off-by: Rusty Russell ru...@rustcorp.com.au commit efda0ad4aa92439d9244d77a13339e23df5e1dc1 Author: Alexey Khoroshilov khoroshi...@ispras.ru Date: Sat Sep 1 23:49:37 2012 +0400 virtio: console: fix error handling in init() function If register_virtio_driver() fails, virtio-ports class is not destroyed. The patch adds error handling of register_virtio_driver(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov khoroshi...@ispras.ru Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org -- 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. -- 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] help, why the same commit in one branch
From: lei yang yanglei.f...@gmail.com The have the same contents. Meaning that the older commit causes significant changes to the files and the newer commit causes no changes to the files. So someone made a second commit that changed nothing but provided a slightly different commit message. Dale Dale Worley -- The French are not against arrogance per se, but in the case of the United States they regard the arrogance as completely unjustified. -- What's So Great About America by Dinesh D'Souza -- 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] help, why the same commit in one branch
On Thu, Mar 21, 2013 at 9:40 PM, Dale R. Worley wor...@alum.mit.edu wrote: From: lei yang yanglei.f...@gmail.com The have the same contents. Meaning that the older commit causes significant changes to the files and the newer commit causes no changes to the files. So someone made a second commit that changed nothing but provided a slightly different commit message. I git show second commit id , it does change code, and the same as the first Lei Dale Dale Worley -- The French are not against arrogance per se, but in the case of the United States they regard the arrogance as completely unjustified. -- What's So Great About America by Dinesh D'Souza -- 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. -- 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] help, why the same commit in one branch
From: lei yang yanglei.f...@gmail.com I git show second commit id , it does change code, and the same as the first That is quite odd. Have you checked what the graph of commit parents is? Dale -- 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.