From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
To: Jiri Slaby <jirislaby@gmail.com>
Cc: Bob Copeland <me@bobcopeland.com>,
tomasw@gmail.com, Dave Young <hidave.darkstar@gmail.com>,
stable@kernel.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org, linville@tuxdriver.com,
Pekka Enberg <penberg@cs.helsinki.fi>,
ath5k-devel@venema.h4ckr.net, johannes@sipsolutions.net,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: git-describe [Was: ath5k_config_interface deadlock fix]
Date: Fri, 01 Aug 2008 17:11:54 +0100 [thread overview]
Message-ID: <489335CA.9000204@tuffmail.co.uk> (raw)
In-Reply-To: <48932AFA.5020903@gmail.com>
Jiri Slaby wrote:
> Alan Jenkins napsal(a):
>> There must be a better way (for efficient merges, right?). But all I
>> can think of is comparing the files in question against the diff. I
>> checked myself and the changes don't appear to have been included in
>> v2.6.26.
>
> Ah, I see. Is this a git-describe bug or my misunderstanding of the tool?
It's not an implementation bug. It's just very easy to misunderstand.
git-describe only looks _back_ in time to what the current commit is
based on. In this case the commit was based on v2.6.26-rc8 - but it
_wasn't_ merged into 2.6.26. It was presumably merged in for
v2.6.27-rc1. This is a perfectly legal history in GIT.
It's probably most often encountered during git-bisect. If you bisect
e.g. between v2.6.26 and v.2.6.27-rc1, you're likely to see commits
which were based on v2.6.26-rc8.
If that doesn't help, try finding an introduction to GIT with some good
pictures. I think it's easier to understand it visually.
Alan
next prev parent reply other threads:[~2008-08-01 16:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 7:46 [PATCH] ath5k : ath5k_config_interface deadlock fix Dave Young
2008-08-01 8:01 ` Jiri Slaby
2008-08-01 8:03 ` Pekka Enberg
2008-08-01 8:14 ` Andrew Morton
2008-08-01 13:43 ` Bob Copeland
2008-08-01 15:02 ` Jiri Slaby
2008-08-01 15:21 ` Jiri Slaby
2008-08-01 15:21 ` [ath5k-devel] " Alan Jenkins
2008-08-01 15:25 ` git-describe [Was: ath5k_config_interface deadlock fix] Jiri Slaby
2008-08-01 16:11 ` Alan Jenkins [this message]
2008-08-01 15:23 ` [PATCH] ath5k : ath5k_config_interface deadlock fix Bob Copeland
2008-08-01 16:28 ` [ath5k-devel] " Alan Jenkins
2008-08-04 3:02 ` Dave Young
2008-08-04 8:06 ` Jiri Slaby
2008-08-04 9:02 ` Dave Young
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=489335CA.9000204@tuffmail.co.uk \
--to=alan-jenkins@tuffmail.co.uk \
--cc=akpm@linux-foundation.org \
--cc=ath5k-devel@venema.h4ckr.net \
--cc=hidave.darkstar@gmail.com \
--cc=jirislaby@gmail.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=me@bobcopeland.com \
--cc=penberg@cs.helsinki.fi \
--cc=stable@kernel.org \
--cc=tomasw@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).