{"thread":{"id":"7930","subject":"git cvsimport fails","startedAt":"2007-05-01T15:47:21Z","lastAt":"2007-05-06T07:04:38Z","messageCount":4,"participants":["Thomas Hühn","Florian Weimer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"40828","messageId":"87ejm0mtpy.fsf@mid.thomas-huehn.de","threadId":"7930","inReplyTo":null,"subject":"git cvsimport fails","fromName":"Thomas Hühn","fromEmail":"newsgroups@thomas-huehn.de","sentAt":"2007-05-01T15:47:21Z","receivedAt":"2007-05-01T15:47:21Z","isPatch":false,"sender":{"key":"newsgroups@thomas-huehn.de","avatar":null},"body":"Hi\n\nI'm trying to import from a CVS repository and get this error message at\nthe end:\n\n|Commit ID 076fd7d71925bb551320aa20aa8eec68bf218f45\n|DONE.\n|fatal: Needed a single revision\n|Can merge only exactly one commit into empty head\n|Could not merge origin into the current branch.\n\nIs my git repo broken, is the CVS repo broken, is it just a shortcoming\nof cvsimport? Any idea whether it is fixable?\n\nThomas\n"},{"id":"40830","messageId":"87abwomtdl.fsf@mid.thomas-huehn.de","threadId":"7930","inReplyTo":"87ejm0mtpy.fsf@mid.thomas-huehn.de","subject":"Re: git cvsimport fails","fromName":"Thomas Hühn","fromEmail":"newsgroups@thomas-huehn.de","sentAt":"2007-05-01T15:54:46Z","receivedAt":"2007-05-01T15:54:46Z","isPatch":false,"sender":{"key":"newsgroups@thomas-huehn.de","avatar":null},"body":"Thomas Hühn <newsgroups@thomas-huehn.de> writes:\n\n> I'm trying to import from a CVS repository and get this error message at\n> the end:\n>\n> |Commit ID 076fd7d71925bb551320aa20aa8eec68bf218f45\n> |DONE.\n> |fatal: Needed a single revision\n> |Can merge only exactly one commit into empty head\n> |Could not merge origin into the current branch.\n>\n> Is my git repo broken, is the CVS repo broken, is it just a shortcoming\n> of cvsimport? Any idea whether it is fixable?\n\nOkay, should have looked further for suitable git commands. git-fsck\ntells me that HEAD is not a symbolic ref.\n\nHEAD contains \"ref: refs/heads/master\", but refs/heads contains no\n\"master\", just other files.\n\nCan I find out, which hash master should point at?\n\nThomas\n"},{"id":"41179","messageId":"87lkg2v4ha.fsf@mid.deneb.enyo.de","threadId":"7930","inReplyTo":"87abwomtdl.fsf@mid.thomas-huehn.de","subject":"Re: git cvsimport fails","fromName":"Florian Weimer","fromEmail":"fw@deneb.enyo.de","sentAt":"2007-05-06T06:41:21Z","receivedAt":"2007-05-06T06:41:21Z","isPatch":false,"sender":{"key":"fw@deneb.enyo.de","avatar":null},"body":"* Thomas Hühn:\n\n> HEAD contains \"ref: refs/heads/master\", but refs/heads contains no\n> \"master\", just other files.\n>\n> Can I find out, which hash master should point at?\n\nAfter the initial checkout, it should point to \"origin\"; this is the\nHEAD of the CVS repository.  Of course, if your main development line\nresides on another branch, you should use that.\n"},{"id":"41183","messageId":"87ejlu1lh5.fsf@mid.thomas-huehn.de","threadId":"7930","inReplyTo":"87lkg2v4ha.fsf@mid.deneb.enyo.de","subject":"Re: git cvsimport fails","fromName":"Thomas Hühn","fromEmail":"newsgroups@thomas-huehn.de","sentAt":"2007-05-06T07:04:38Z","receivedAt":"2007-05-06T07:04:38Z","isPatch":false,"sender":{"key":"newsgroups@thomas-huehn.de","avatar":null},"body":"Florian Weimer <fw@deneb.enyo.de> writes:\n\n> * Thomas Hühn:\n>\n>> HEAD contains \"ref: refs/heads/master\", but refs/heads contains no\n>> \"master\", just other files.\n>>\n>> Can I find out, which hash master should point at?\n>\n> After the initial checkout, it should point to \"origin\"; this is the\n> HEAD of the CVS repository.  Of course, if your main development line\n> resides on another branch, you should use that.\n\nOkay, thanks. I'll enter that.\n\nThomas\n"}]}