summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Langhoff <martin@catalyst.net.nz>2006-03-03 16:57:03 +1300
committerMartin Langhoff <martin@catalyst.net.nz>2006-03-03 16:57:03 +1300
commitcfcbd3427e67056a00ec832645b057eaf33888d9 (patch)
treeded7513106cea9bd4506e20bced401f9506d5b39
parent5398fed96699b5321678fdace86b6d4c62a155fb (diff)
downloadgit-cfcbd3427e67056a00ec832645b057eaf33888d9.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 f707bd9376..abae4e7ee4 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;
}