{"thread":{"id":"18291","subject":"RE: newb: Given a commit id, find which branches have it as an ancestor","startedAt":"2009-03-12T19:38:38Z","lastAt":"2009-03-13T13:31:51Z","messageCount":5,"participants":["Kelly F. Hickel","Johannes Sixt","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"107876","messageId":"63BEA5E623E09F4D92233FB12A9F794302E0F9BA@emailmn.mqsoftware.com","threadId":"18291","inReplyTo":"63BEA5E623E09F4D92233FB12A9F794302E0F9B2@emailmn.mqsoftware.com","subject":"RE: newb: Given a commit id, find which branches have it as an ancestor","fromName":"Kelly F. Hickel","fromEmail":"kfh@mqsoftware.com","sentAt":"2009-03-12T19:38:38Z","receivedAt":"2009-03-12T19:38:38Z","isPatch":false,"sender":{"key":"kfh@mqsoftware.com","avatar":null},"body":"> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On\n> Behalf Of Johannes Sixt\n> Sent: Thursday, March 12, 2009 10:38 AM\n> To: Kelly F. Hickel\n\n> $ git branch -a --contains the-sha1\n> \n> -- Hannes\n> \n\nThanks, that looks like a really useful command.\n\nUnfortunately, in this case it didn't print anything out (neither did\n\"git branch -r -a sha1\").\n\nWhat I'm beginning to suspect is that all the commits that should have\ngone to master went to some unnamed branch.\nIs that reasonable/possible/likely?  This commit has a full ancestry,\nbut doesn't appear to be on any branch.\n\nIn the above question there's an assumption that if a branch exists\nwithout a name, then git branch -a --contains wouldn't print anything\nout, is that correct?\n\nThanks,\nKelly\n"},{"id":"107909","messageId":"49BA07E5.2080701@viscovery.net","threadId":"18291","inReplyTo":"63BEA5E623E09F4D92233FB12A9F794302E0F9BA@emailmn.mqsoftware.com","subject":"Re: newb: Given a commit id, find which branches have it as an ancestor","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-03-13T07:14:45Z","receivedAt":"2009-03-13T07:14:45Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Kelly F. Hickel schrieb:\n>> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On\n>> Behalf Of Johannes Sixt\n>> Sent: Thursday, March 12, 2009 10:38 AM\n>> To: Kelly F. Hickel\n> \n>> $ git branch -a --contains the-sha1\n>>\n>> -- Hannes\n>>\n> \n> Thanks, that looks like a really useful command.\n> \n> Unfortunately, in this case it didn't print anything out (neither did\n> \"git branch -r -a sha1\").\n> \n> What I'm beginning to suspect is that all the commits that should have\n> gone to master went to some unnamed branch.\n> Is that reasonable/possible/likely?  This commit has a full ancestry,\n> but doesn't appear to be on any branch.\n> \n> In the above question there's an assumption that if a branch exists\n> without a name, then git branch -a --contains wouldn't print anything\n> out, is that correct?\n\nCorrect.\n\nYour best bet is perhaps that you create a branch at the commit\n\n  $ git branch tmp-branch your_sha1\n\nso that the commits are not lost, then you cherry-pick them to master.\n\n-- Hannes\n"},{"id":"107910","messageId":"7v3adhj2ku.fsf@gitster.siamese.dyndns.org","threadId":"18291","inReplyTo":"49BA07E5.2080701@viscovery.net","subject":"Re: newb: Given a commit id, find which branches have it as an ancestor","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-13T07:37:21Z","receivedAt":"2009-03-13T07:37:21Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt <j.sixt@viscovery.net> writes:\n\n> Your best bet is perhaps that you create a branch at the commit\n>\n>   $ git branch tmp-branch your_sha1\n>\n> so that the commits are not lost, then you cherry-pick them to master.\n\nIt could be that there are more commits that are built on top of the one\nyou are aware of.  Finding unreachable commits from \"git fsck --full\"\nmight help you find them.\n"},{"id":"107944","messageId":"63BEA5E623E09F4D92233FB12A9F794302E0F9D8@emailmn.mqsoftware.com","threadId":"18291","inReplyTo":"49BA07E5.2080701@viscovery.net","subject":"RE: newb: Given a commit id, find which branches have it as an ancestor","fromName":"Kelly F. Hickel","fromEmail":"kfh@mqsoftware.com","sentAt":"2009-03-13T13:30:57Z","receivedAt":"2009-03-13T13:30:57Z","isPatch":false,"sender":{"key":"kfh@mqsoftware.com","avatar":null},"body":"> -----Original Message-----\n> From: Johannes Sixt [mailto:j.sixt@viscovery.net]\n> Sent: Friday, March 13, 2009 2:15 AM\n> To: Kelly F. Hickel\n> Cc: git@vger.kernel.org\n> Subject: Re: newb: Given a commit id, find which branches have it as\nan\n> ancestor\n> \n> Kelly F. Hickel schrieb:\n> >> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org]\n> On\n> >> Behalf Of Johannes Sixt\n> >> Sent: Thursday, March 12, 2009 10:38 AM\n> >> To: Kelly F. Hickel\n> >\n> >> $ git branch -a --contains the-sha1\n> >>\n> >> -- Hannes\n> >>\n> >\n> > Thanks, that looks like a really useful command.\n> >\n> > Unfortunately, in this case it didn't print anything out (neither\ndid\n> > \"git branch -r -a sha1\").\n> >\n> > What I'm beginning to suspect is that all the commits that should\n> have\n> > gone to master went to some unnamed branch.\n> > Is that reasonable/possible/likely?  This commit has a full\nancestry,\n> > but doesn't appear to be on any branch.\n> >\n> > In the above question there's an assumption that if a branch exists\n> > without a name, then git branch -a --contains wouldn't print\nanything\n> > out, is that correct?\n> \n> Correct.\n> \n> Your best bet is perhaps that you create a branch at the commit\n> \n>   $ git branch tmp-branch your_sha1\n> \n> so that the commits are not lost, then you cherry-pick them to master.\n> \n> -- Hannes\n\nThanks, in the end it turned out that I just hadn't properly understood\nthe \nComment about doing your own merge in the git-cvsimport doc.  For\nwhatever\nreason, when doing cvsimport in a workspace on master, after the import\nI \nhave to do \"git merge origin/master\" and it fast forwards it and all is\nwell.\nI *don't* have to do that for any of the other branches that get\naffected by\nthe cvsimport, so that threw me for awhile.\n\nThanks for the help,\nKelly\n"},{"id":"107945","messageId":"63BEA5E623E09F4D92233FB12A9F794302E0F9D9@emailmn.mqsoftware.com","threadId":"18291","inReplyTo":"7v3adhj2ku.fsf@gitster.siamese.dyndns.org","subject":"RE: newb: Given a commit id, find which branches have it as an ancestor","fromName":"Kelly F. Hickel","fromEmail":"kfh@mqsoftware.com","sentAt":"2009-03-13T13:31:51Z","receivedAt":"2009-03-13T13:31:51Z","isPatch":false,"sender":{"key":"kfh@mqsoftware.com","avatar":null},"body":"> -----Original Message-----\n> From: Junio C Hamano [mailto:gitster@pobox.com]\n> Sent: Friday, March 13, 2009 2:37 AM\n> To: Johannes Sixt\n> Cc: Kelly F. Hickel; git@vger.kernel.org\n> Subject: Re: newb: Given a commit id, find which branches have it as\nan\n> ancestor\n> \n> Johannes Sixt <j.sixt@viscovery.net> writes:\n> \n> > Your best bet is perhaps that you create a branch at the commit\n> >\n> >   $ git branch tmp-branch your_sha1\n> >\n> > so that the commits are not lost, then you cherry-pick them to\n> master.\n> \n> It could be that there are more commits that are built on top of the\n> one\n> you are aware of.  Finding unreachable commits from \"git fsck --full\"\n> might help you find them.\n\nThanks, turned out to be my misunderstanding of how to do incremental\nimports\n(see my response to Johannes).\n\nThanks for the help,\n-Kelly\n"}]}