Re: bug in name-rev on linux-2.6 repo?
- From
Jeff King <peff@peff.net>
- Date
- Apr 22, 2010, 14:44 UTC
- Message-ID
- <20100422144433.GB28923@coredump.intra.peff.net>
- In-Reply-To
- <m2hbn37e7q.fsf@igel.home>
On Thu, Apr 22, 2010 at 04:29:29PM +0200, Andreas Schwab wrote:
Show 22 quoted lines
> Jonathan Nieder <jrnieder@gmail.com> writes: > > > Hi maks, > > > > maximilian attems wrote: > > > >> ~/src/linux-2.6$ git name-rev a1de02dccf906faba2ee2d99cac56799bda3b96a > >> a1de02dccf906faba2ee2d99cac56799bda3b96a undefined > > > > Thanks for pointing it out. This is weird. > > > > The commit doesn’t seem to be part of any tagged release, nor linus’s > > master: > > $ git branch --contains a1de02dccf906faba2ee2d99cac56799bda3b96a > * master > $ git merge-base v2.6.34-rc1 a1de02dccf906faba2ee2d99cac56799bda3b96a > a1de02dccf906faba2ee2d99cac56799bda3b96a > git merge-base v2.6.33 a1de02dccf906faba2ee2d99cac56799bda3b96a > 724e6d3fe8003c3f60bf404bf22e4e331327c596 > > So it has been merged beween v2.6.33 and v2.6.34-rc1
Hmm. Maybe clock skew in the commit timestamps is at fault? With this patch to git:
diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 06a38ac..7a024ab 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -29,9 +29,6 @@ static void name_rev(struct commit *commit, if (!commit->object.parsed) parse_commit(commit); - if (commit->date < cutoff) - return; - if (deref) { char *new_name = xmalloc(strlen(tip_name)+3); strcpy(new_name, tip_name); I get: $ $ git name-rev a1de02dccf906faba2ee2d99cac56799bda3b96a a1de02dccf906faba2ee2d99cac56799bda3b96a tags/v2.6.34-rc1~199^2~35 but I haven't tracked down the problematic commit and timestamp yet. -Peff