Hi Jesper, On Sat, 5 Mar 2011 21:45:19 +0100 (CET) Jesper Juhl <jj@xxxxxxxxxxxxx> wrote: > > I noticed something currious today in linux-next. > There are, what looks to me like, duplicate patches with different commit > id's but identical contents. Perhaps this is just a git artefact that I > don't know about, but it seemed currious enough that I thought I'd ask. This happens sometimes ... > The two patches are these (from 'git log'): > > commit a9c3809db31be860db4e8ecf8ab359159c935a3b > Author: Jesper Juhl <jj@xxxxxxxxxxxxx> > Date: Wed Feb 23 23:45:55 2011 +0100 This one is in the voltage tree. > commit 4b2f67d756cf4a5ed8e8d11caa7dcea06c41a09e > Author: Jesper Juhl <jj@xxxxxxxxxxxxx> > Date: Wed Feb 23 23:45:55 2011 +0100 This one is in Linus' tree. > If I do a 'git log drivers/regulator/mc13xxx-regulator-core.c' I only see > commit 4b2f67d756cf4a5ed8e8d11caa7dcea06c41a09e . git filters out "uninteresting" commits including duplicates like this. > Please enlighten me if this is perfectly normal and not a problem. > Currently I'm a bit puzzled by two commit id's showing up for the same > change.. Its perfectly normal, it just means that the branch of the voltage tree has included in linux-next is not based on (or merged with) the branch that is has been submitted to Linus. This happens a bit with bug fixes. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp7Y18L9GLMV.pgp
Description: PGP signature
