Browse Source

cvsserver: Fix for work trees

git-cvsserver used checkout-index internally for commit and annotate.
Since a work tree is required for this to function now, this was
breaking.  Work around this by defining GIT_WORK_TREE=. in the
appropriate places.

Signed-off-by: Brian Downing <bdowning@lavos.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brian Downing 18 years ago committed by Junio C Hamano
parent
commit
b50be1d80f
  1. 2
      git-cvsserver.perl

2
git-cvsserver.perl

@ -1196,6 +1196,7 @@ sub req_ci @@ -1196,6 +1196,7 @@ sub req_ci
$log->info("Lockless commit start, basing commit on '$tmpdir', index file is '$file_index'");

$ENV{GIT_DIR} = $state->{CVSROOT} . "/";
$ENV{GIT_WORK_TREE} = ".";
$ENV{GIT_INDEX_FILE} = $file_index;

# Remember where the head was at the beginning.
@ -1721,6 +1722,7 @@ sub req_annotate @@ -1721,6 +1722,7 @@ sub req_annotate
$log->info("Temp checkoutdir creation successful, basing annotate session work on '$tmpdir', index file is '$file_index'");

$ENV{GIT_DIR} = $state->{CVSROOT} . "/";
$ENV{GIT_WORK_TREE} = ".";
$ENV{GIT_INDEX_FILE} = $file_index;

chdir $tmpdir;

Loading…
Cancel
Save