git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Kelly F. Hickel" <kfh@mqsoftware.com>
To: <git@vger.kernel.org>
Cc: "Kelly F. Hickel" <kfh@mqsoftware.com>
Subject: newb: Given a commit id, find which branches have it as an ancestor
Date: Thu, 12 Mar 2009 10:21:50 -0500	[thread overview]
Message-ID: <63BEA5E623E09F4D92233FB12A9F794302E0F98D@emailmn.mqsoftware.com> (raw)

Hi all, I've been working on testing importing our cvs repo via cvs2git,
then using cvsps to pull incremental updates.  Something seems to have
gone awry with one of the commits, and I'm having trouble tracking it
down.

This is a question about how to track something down after the fact, not
a question about what went wrong with the cvsps import....

This is git 1.6.1 running on Centos 5.2 linux.

So, the scenario is that one of the last few commits pulled into my git
repo by cvsps/cvsimport should have landed on origin/master, but when I
look at the file, the change is missing.  I'm trying to figure out
"where it went", since it didn't go where I expected it.

Things I've tried that didn't tell me what I wanted to know:
$ git name-rev 15fa81b
15fa81b undefined


$ git log --children 15fa81b
This shows me a bunch of commits that, going by the commit date, appear
to be ancestors of the commit I'm interested in, not children.

$ git checkout  15fa81b5ae
Note: moving to "15fa81b5ae" which isn't a local branch If you want to
create a new branch from this checkout, you may do so (now or later) by
using -b with the checkout command again. Example:
  git checkout -b <new_branch_name>
HEAD is now at 15fa81b... Changed version to 4.1.0.157 $ gitk (as
expected, shows me that the commit I care about is the latest in the
workspace)

$ git checkout master
Previous HEAD position was 15fa81b... Changed version to 4.1.0.157
Switched to branch "master"
$ gitk
Doesn't list my target commit, in fact, doesn't list any commits after
the cvs2git date, so it appears that none of my cvsps pulled commits
landed on master (ok, so maybe this post is about what went wrong, just
a little ;-} ).

I suspect that I'm missing some factoid in trying to map my workflow to
Git, but this seems like the kind of thing I'd want to know, i.e. given
a commit, what branches have that commit as an ancestor.  It would seem
to be useful in two cases:
1) I've found a commit that introduced a bug and want to know what
releases that bug ended up in.
2) I've identified a fix for a previous bug and want to know what
releases already contain the fix.
(ok, those are pretty much the same workflow, but different reasons).

What am I missing????



--

Kelly F. Hickel
Senior Product Architect
MQSoftware, Inc.
952-345-8677 Office
952-345-8721 Fax
kfh@mqsoftware.com
www.mqsoftware.com
Certified IBM SOA Specialty
Your Full Service Provider for IBM WebSphere
Learn more at www.mqsoftware.com 

             reply	other threads:[~2009-03-12 15:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-12 15:21 Kelly F. Hickel [this message]
2009-03-12 15:38 ` newb: Given a commit id, find which branches have it as an ancestor Johannes Sixt
     [not found] <63BEA5E623E09F4D92233FB12A9F794302E0F9B2@emailmn.mqsoftware.com>
2009-03-12 19:38 ` Kelly F. Hickel
2009-03-13  7:14   ` Johannes Sixt
2009-03-13  7:37     ` Junio C Hamano
2009-03-13 13:31       ` Kelly F. Hickel
2009-03-13 13:30     ` Kelly F. Hickel
  -- strict thread matches above, loose matches on Subject: below --
2009-03-13 16:20 John Dlugosz

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=63BEA5E623E09F4D92233FB12A9F794302E0F98D@emailmn.mqsoftware.com \
    --to=kfh@mqsoftware.com \
    --cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).