summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Langhoff <martin@catalyst.net.nz>2006-03-03 16:57:03 +1300
committerJunio C Hamano <junkio@cox.net>2006-03-02 22:56:28 -0800
commite74ee784c7daf560044dad4a06fae66732ed414b (patch)
tree4d6da9d58e14b644a68c283a91860f8b3b6403a1
parent501c7372c73c980eed042c90e3518c2ab816c846 (diff)
downloadgit-e74ee784c7daf560044dad4a06fae66732ed414b.tar.gz
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.
-rwxr-xr-xgit-cvsserver.perl10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 40b9c2af34..6f10d4c951 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -576,9 +576,9 @@ sub req_co
# Eclipse seems to need the Clear-sticky command
# to prepare the 'Entries' file for the new directory.
print "Clear-sticky $checkout_path/\n";
- print $state->{CVSROOT} . "/$checkout_path/\n";
+ print $state->{CVSROOT} . "/$module/\n";
print "Clear-static-directory $checkout_path/\n";
- print $state->{CVSROOT} . "/$checkout_path/\n";
+ print $state->{CVSROOT} . "/$module/\n";
# instruct the client that we're checking out to $checkout_path
print "E cvs checkout: Updating $checkout_path\n";
@@ -609,11 +609,11 @@ sub req_co
# Eclipse seems to need the Clear-sticky command
# to prepare the 'Entries' file for the new directory.
- print "Clear-sticky $module/$git->{dir}\n";
+ print "Clear-sticky $checkout_path/$git->{dir}\n";
print $state->{CVSROOT} . "/$module/$git->{dir}\n";
- print "Clear-static-directory $module/$git->{dir}\n";
+ print "Clear-static-directory $checkout_path/$git->{dir}\n";
print $state->{CVSROOT} . "/$module/$git->{dir}\n";
- print "E cvs checkout: Updating /$module/$git->{dir}\n";
+ print "E cvs checkout: Updating /$checkout_path/$git->{dir}\n";
$lastdir = $git->{dir};
$seendirs{$git->{dir}} = 1;
}