git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 13, 2008, 23:15 UTC
Message-ID
<7vr6eew70a.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<47D9A836.9010601@catalyst.net.nz>
Martin Langhoff <martin@catalyst.net.nz> writes:
Show 22 quoted lines
> 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?

Martin, it may not even be in $git_dir/refs/heads/$last_branch ;-) The refs can be packed.

By the way, doesn't cvsimport fail when your HEAD is detached with this code?

I always have cvsimport update the pristine upstream branch and rebase my work against it, so I never have the branch cvsimport updates checked out, and for meit seems to work wonderfully (well, at least as wonderful as a workflow that involves any CVS in it could be). I do not see a reason why it should not to work similarly well when my HEAD is detached..

Previous: Martin LanghoffNext: Martin Langhoff
Message 7 of 9 in “git-cvsimport: fix initial checkout”
  1. git-cvsimport: fix initial checkoutMarc-Andre Lureau, Mar 13, 2008
  2. Junio C HamanoMar 13, 2008
  3. Martin LanghoffMar 13, 2008
  4. Marc-André LureauMar 13, 2008
  5. Marc-André LureauMar 13, 2008
  6. Martin LanghoffMar 13, 2008
  7. Junio C HamanoMar 13, 2008
  8. Martin LanghoffMar 13, 2008
  9. Marc-André LureauMar 13, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.