Re: [PATCH] git-cvsimport: fix initial checkout

From: Martin Langhoff <martin@catalyst.net.nz>
Date: Mar 13, 2008, 22:18 UTC
Message-ID: <47D9A836.9010601@catalyst.net.nz>
In-Reply-To: <1205435378-10411-1-git-send-email-marcandre.lureau@gmail.com>

Marc-Andre Lureau wrote:

> git-symbolic-ref HEAD returns master reference, even if the file does
> not exists. That prevents the initial checkout and fails in
> git-rev-parse.

But you are patching the block that gets triggered on subsequent imports, this code does not deal with "initial checkout" unless something else is wrong. The line right above the open() is an else that has the block that matters.

> The patch checks the existence of the reference file
> before assuming an original branch exists. There might be better
> solutions than checking file existence.

There are indeed. If we need this patch -- then you can call git ref-parse right to see if you get a sha1.

> -	unless ($last_branch) {
> +	if (-f "$git_dir/$last_branch") {

Note that the file won't exist there in any modern git. It will be in $git_dir/refs/heads/$last_branch. Did you test this patch?

What's your workflow with cvsimport? Perhaps you are doing something strange with it... :-)

cheers,

martin

-- 
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ  Ltd, PO Box 11-053, Manners St,  Wellington
WEB: http://catalyst.net.nz/           PHYS: Level 2, 150-154 Willis St
NZ: +64(4)916-7224    MOB: +64(21)364-017    UK: 0845 868 5733 ext 7224
      Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------