From: Miklos Vajna <vmiklos@frugalware.org>
Date: Wed, 10 Nov 2010 22:07:30 GMT
Subject: Re: git describe weird behaviour
Message-ID: <20101110220730.GR22105@genesis.frugalware.org>
In-Reply-To: <20101110212410.GA13782@burratino>

On Wed, Nov 10, 2010 at 03:24:10PM -0600, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Miklos Vajna wrote:
> 
> > But I think the approach to follow the first parent only would solve the
> > problem outlined in the commit message of 80dbae0 as well: I think it's
> > pretty rare to tag a commit in a feature branch, then merge it.
> 
> Doesn't that happen in linux-2.6 history fairly often (subsystem trees
> syncing with upstream)?

Hm, makes sense - I don't think it ever happened in
torvalds/linux-2.6.git, but probably it happens in subsystem trees where
a given maintainer never tags anything, but regularly merges from
torvalds/linux-2.6.git. So my proposal would break git describe output
when it's invoked in a subsystem tree, you are right.

(Note that Peff's patch at least fixes the tag part of the issue for me,
and that should not really break the above situation.)