git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: git@vger.kernel.org
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: Q: how can i find the upstream merge point of a commit?
Date: Wed, 8 Jun 2011 11:36:48 +0200	[thread overview]
Message-ID: <20110608093648.GA19038@elte.hu> (raw)


This might be a FAQ, but i couldn't find an elegant Git-ish answer 
for it, so please bear with my stupid question :-)

In an upstream Linux kernel Git repo, with linux-next as a remote 
present (but -git checked out), what is the way to find out when a 
particular commit was merged upstream?

So for example when was 189d3c4a94 merged upstream?

The proper Git answer would be:

  $ git describe --contains 189d3c4a94
  next-20080501~97

But the next-20080501 tag is useless, and i don't have linux-next as 
HEAD, it's only a remote.

Right now i have this imperfect hack instead:

  $ git log --pretty=oneline 189d3c4a94.. Makefile | tail -5

Which gives this answer:

  $ git log --pretty=oneline 189d3c4a94.. Makefile | tail -5
  b8291ad07a7f3b5b990900f0001198ac23ba893e Linux 2.6.26-rc3
  492c2e476eac010962850006c49df326919b284c Linux 2.6.26-rc2
  a95bcfac2b5f353f99c6a338d77eb5584ab35d83 kbuild: escape meta characters in regular expression in make TAGS
  2ddcca36c8bcfa251724fe342c8327451988be0d Linux 2.6.26-rc1
  90ebd878a5900839106664fae40a6cc83dbe86ab kbuild: fix vmlinux.o link

So i can see that this commit went upstream in the .26 merge window 
and was released in .26-rc1 for the first time.

This (ab)-uses the fact that the toplevel Makefile gets edited for 
every release by Linus, and it does not have many other changes.

But ... it would be much nicer if i could make 'git describe 
--contains' work better.

Any ideas?

Thanks,

	Ingo

             reply	other threads:[~2011-06-08  9:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-08  9:36 Ingo Molnar [this message]
2011-06-08 10:32 ` Q: how can i find the upstream merge point of a commit? Johannes Sixt
2011-06-08 10:34 ` Stephen Rothwell
2011-06-08 10:40   ` Peter Zijlstra
2011-06-08 11:29     ` Stephen Rothwell
2011-06-08 11:51       ` Peter Zijlstra
2011-06-08 12:52   ` Ingo Molnar
2011-06-08 13:49     ` Sverre Rabbelier
2011-06-08 14:27       ` Ingo Molnar
2011-06-08 15:23       ` Nguyen Thai Ngoc Duy
2011-06-14  9:56         ` Johan Herland
2011-06-14 17:12           ` Jeff King
2011-06-14 23:45             ` Johan Herland
2011-06-15 23:00               ` Jeff King
2011-06-15 23:53                 ` Junio C Hamano
2011-06-16  0:48                   ` Jeff King
2011-06-16 11:33                     ` Jakub Narebski
2011-06-08 15:01     ` Junio C Hamano
2011-06-08 15:18       ` Ingo Molnar

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=20110608093648.GA19038@elte.hu \
    --to=mingo@elte.hu \
    --cc=a.p.zijlstra@chello.nl \
    --cc=git@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    /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).