threads / discuss / 18291

RE: newb: Given a commit id, find which branches have it as an ancestor

Subject: RE: newb: Given a commit id, find which branches have it as an ancestor

## tl;dr

5 messages between Mar 12, 2009 and Mar 13, 2009.

replies: 4people: 3as markdown or json

Kelly F. Hickel· Mar 12, 2009, 19:38 UTC · lore
> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On
> Behalf Of Johannes Sixt
> Sent: Thursday, March 12, 2009 10:38 AM
> To: Kelly F. Hickel
> $ git branch -a --contains the-sha1
> 
> -- Hannes
> 
Thanks, that looks like a really useful command.

Unfortunately, in this case it didn't print anything out (neither did "git branch -r -a sha1").

What I'm beginning to suspect is that all the commits that should have gone to master went to some unnamed branch. Is that reasonable/possible/likely? This commit has a full ancestry, but doesn't appear to be on any branch.

In the above question there's an assumption that if a branch exists without a name, then git branch -a --contains wouldn't print anything out, is that correct?

Thanks, Kelly

Johannes Sixt· Mar 13, 2009, 07:14 UTC · re: Kelly F. Hickel · lore

Re: newb: Given a commit id, find which branches have it as an ancestor

Kelly F. Hickel schrieb:
Show 23 quoted lines
>> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On
>> Behalf Of Johannes Sixt
>> Sent: Thursday, March 12, 2009 10:38 AM
>> To: Kelly F. Hickel
> 
>> $ git branch -a --contains the-sha1
>>
>> -- Hannes
>>
> 
> Thanks, that looks like a really useful command.
> 
> Unfortunately, in this case it didn't print anything out (neither did
> "git branch -r -a sha1").
> 
> What I'm beginning to suspect is that all the commits that should have
> gone to master went to some unnamed branch.
> Is that reasonable/possible/likely?  This commit has a full ancestry,
> but doesn't appear to be on any branch.
> 
> In the above question there's an assumption that if a branch exists
> without a name, then git branch -a --contains wouldn't print anything
> out, is that correct?
Correct.
Your best bet is perhaps that you create a branch at the commit
  $ git branch tmp-branch your_sha1
so that the commits are not lost, then you cherry-pick them to master.
-- Hannes
Junio C Hamano· Mar 13, 2009, 07:37 UTC · re: Johannes Sixt · lore

Re: newb: Given a commit id, find which branches have it as an ancestor

Johannes Sixt <j.sixt@viscovery.net> writes:
Show 5 quoted lines
> Your best bet is perhaps that you create a branch at the commit
>
>   $ git branch tmp-branch your_sha1
>
> so that the commits are not lost, then you cherry-pick them to master.

It could be that there are more commits that are built on top of the one you are aware of. Finding unreachable commits from "git fsck --full" might help you find them.

Kelly F. Hickel· Mar 13, 2009, 13:31 UTC · re: Junio C Hamano · lore
Show 6 quoted lines
> -----Original Message-----
> From: Junio C Hamano [mailto:gitster@pobox.com]
> Sent: Friday, March 13, 2009 2:37 AM
> To: Johannes Sixt
> Cc: Kelly F. Hickel; git@vger.kernel.org
> Subject: Re: newb: Given a commit id, find which branches have it as
an
Show 15 quoted lines
> ancestor
> 
> Johannes Sixt <j.sixt@viscovery.net> writes:
> 
> > Your best bet is perhaps that you create a branch at the commit
> >
> >   $ git branch tmp-branch your_sha1
> >
> > so that the commits are not lost, then you cherry-pick them to
> master.
> 
> It could be that there are more commits that are built on top of the
> one
> you are aware of.  Finding unreachable commits from "git fsck --full"
> might help you find them.

Thanks, turned out to be my misunderstanding of how to do incremental imports (see my response to Johannes).

Thanks for the help, -Kelly

Kelly F. Hickel· Mar 13, 2009, 13:30 UTC · re: Johannes Sixt · lore
Show 6 quoted lines
> -----Original Message-----
> From: Johannes Sixt [mailto:j.sixt@viscovery.net]
> Sent: Friday, March 13, 2009 2:15 AM
> To: Kelly F. Hickel
> Cc: git@vger.kernel.org
> Subject: Re: newb: Given a commit id, find which branches have it as
an
Show 17 quoted lines
> ancestor
> 
> Kelly F. Hickel schrieb:
> >> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org]
> On
> >> Behalf Of Johannes Sixt
> >> Sent: Thursday, March 12, 2009 10:38 AM
> >> To: Kelly F. Hickel
> >
> >> $ git branch -a --contains the-sha1
> >>
> >> -- Hannes
> >>
> >
> > Thanks, that looks like a really useful command.
> >
> > Unfortunately, in this case it didn't print anything out (neither
did
Show 6 quoted lines
> > "git branch -r -a sha1").
> >
> > What I'm beginning to suspect is that all the commits that should
> have
> > gone to master went to some unnamed branch.
> > Is that reasonable/possible/likely?  This commit has a full
ancestry,
> > but doesn't appear to be on any branch.
> >
> > In the above question there's an assumption that if a branch exists
> > without a name, then git branch -a --contains wouldn't print
anything
Show 11 quoted lines
> > out, is that correct?
> 
> Correct.
> 
> Your best bet is perhaps that you create a branch at the commit
> 
>   $ git branch tmp-branch your_sha1
> 
> so that the commits are not lost, then you cherry-pick them to master.
> 
> -- Hannes

Thanks, in the end it turned out that I just hadn't properly understood the Comment about doing your own merge in the git-cvsimport doc. For whatever reason, when doing cvsimport in a workspace on master, after the import I have to do "git merge origin/master" and it fast forwards it and all is well. I *don't* have to do that for any of the other branches that get affected by the cvsimport, so that threw me for awhile.

Thanks for the help, Kelly

← back to recent threads