Skip to content

Commit cfcbd34

Browse files
author
Martin Langhoff
committed
cvsserver: fix checkouts with -d <somedir>
A recent Eclipse compat fix broke checkouts with -d. Fix it so that the server sends the correct module name instead of the destination directory name.
1 parent 5398fed commit cfcbd34

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

git-cvsserver.perl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,9 @@ sub req_co
576576
# Eclipse seems to need the Clear-sticky command
577577
# to prepare the 'Entries' file for the new directory.
578578
print "Clear-sticky $checkout_path/\n";
579-
print $state->{CVSROOT} . "/$checkout_path/\n";
579+
print $state->{CVSROOT} . "/$module/\n";
580580
print "Clear-static-directory $checkout_path/\n";
581-
print $state->{CVSROOT} . "/$checkout_path/\n";
581+
print $state->{CVSROOT} . "/$module/\n";
582582

583583
# instruct the client that we're checking out to $checkout_path
584584
print "E cvs checkout: Updating $checkout_path\n";
@@ -609,11 +609,11 @@ sub req_co
609609

610610
# Eclipse seems to need the Clear-sticky command
611611
# to prepare the 'Entries' file for the new directory.
612-
print "Clear-sticky $module/$git->{dir}\n";
612+
print "Clear-sticky $checkout_path/$git->{dir}\n";
613613
print $state->{CVSROOT} . "/$module/$git->{dir}\n";
614-
print "Clear-static-directory $module/$git->{dir}\n";
614+
print "Clear-static-directory $checkout_path/$git->{dir}\n";
615615
print $state->{CVSROOT} . "/$module/$git->{dir}\n";
616-
print "E cvs checkout: Updating /$module/$git->{dir}\n";
616+
print "E cvs checkout: Updating /$checkout_path/$git->{dir}\n";
617617
$lastdir = $git->{dir};
618618
$seendirs{$git->{dir}} = 1;
619619
}

0 commit comments

Comments
 (0)