git rev-parse --verify HEAD: fatal: Needed a single revision

git rev-parse --verify HEAD: fatal: Needed a single revision

[Arkadiusz Miskiewicz]

Hello,

I'm trying to git cvsimport a cvs repository. Process ends with:
DONE.
fatal: Needed a single revision
Can merge only exactly one commit into empty head
Could not merge origin into the current branch.

The fatal comes from:
$ git rev-parse --verify HEAD
fatal: Needed a single revision


What is the problem here and how to fix it?



How to reproduce:
get http://carme.pld-linux.org/~arekm/rpm5.tar.bz2
unpack
cd rpm5
git cvsimport -v -d :pserver:anonymous@rpm5.org:/cvs rpm


I'm using:
$ git --version
git version 1.5.6.4

-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/

Re: git rev-parse --verify HEAD: fatal: Needed a single revision

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 840 bytes --]

On Fri, Aug 01, 2008 at 11:29:04AM +0200, Arkadiusz Miskiewicz <arekm@pld-linux.org> wrote:
> How to reproduce:
> get http://carme.pld-linux.org/~arekm/rpm5.tar.bz2
> unpack
> cd rpm5
> git cvsimport -v -d :pserver:anonymous@rpm5.org:/cvs rpm

I did:

git cvsimport -v -d :pserver:anonymous@rpm5.org:/cvs -o master -C rpm rpm

first time it bailed out with an error, sadly I don't exactly remember,
but it was different to your error. Then I ran it again (of course
without rm -rf rpm) and it finished properly. The cvs checkout and git
HEAD differs only in one file (python/Makefile.in is removed in cvs, but
not in git).

I put it out to http://vmiklos.hu/gitweb/?p=rpm.git, if you are
interested.

> I'm using:
> $ git --version
> git version 1.5.6.4

$ git --version
git version 1.6.0.rc0.14.g95f8.dirty

Not sure if it matters or not.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]