From: Miklos Vajna <vmiklos@frugalware.org>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: git describe weird behaviour
Date: Wed, 10 Nov 2010 23:07:30 +0100 [thread overview]
Message-ID: <20101110220730.GR22105@genesis.frugalware.org> (raw)
In-Reply-To: <20101110212410.GA13782@burratino>
[-- Attachment #1: Type: text/plain, Size: 898 bytes --]
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.)
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
prev parent reply other threads:[~2010-11-10 22:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-10 1:00 git describe weird behaviour Miklos Vajna
2010-11-10 4:14 ` Jeff King
2010-11-10 8:47 ` Maaartin
2010-11-10 8:52 ` Thomas Rast
2010-11-10 14:03 ` Miklos Vajna
2010-12-09 1:33 ` Miklos Vajna
2010-12-09 3:28 ` Jeff King
2010-11-10 19:38 ` Junio C Hamano
2010-11-10 20:40 ` Miklos Vajna
2010-11-10 21:24 ` Jonathan Nieder
2010-11-10 22:07 ` Miklos Vajna [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101110220730.GR22105@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).