2 messages, 1 author, 2016-06-15 · open the first message on its own page
From: Thomas Hühn <hidden>
Date: 2016-06-15 22:43:07
Hi I'm trying to import from a CVS repository and get this error message at the end: |Commit ID 076fd7d71925bb551320aa20aa8eec68bf218f45 |DONE. |fatal: Needed a single revision |Can merge only exactly one commit into empty head |Could not merge origin into the current branch. Is my git repo broken, is the CVS repo broken, is it just a shortcoming of cvsimport? Any idea whether it is fixable? Thomas
From: Thomas Hühn <hidden>
Date: 2016-06-15 22:43:07
Thomas Hühn [off-list ref] writes:
I'm trying to import from a CVS repository and get this error message at the end: |Commit ID 076fd7d71925bb551320aa20aa8eec68bf218f45 |DONE. |fatal: Needed a single revision |Can merge only exactly one commit into empty head |Could not merge origin into the current branch. Is my git repo broken, is the CVS repo broken, is it just a shortcoming of cvsimport? Any idea whether it is fixable?
Okay, should have looked further for suitable git commands. git-fsck tells me that HEAD is not a symbolic ref. HEAD contains "ref: refs/heads/master", but refs/heads contains no "master", just other files. Can I find out, which hash master should point at? Thomas