From: Martin Langhoff <martin@catalyst.net.nz>
Date: Fri, 3 Mar 2006 03:57:03 +0000 (+1300)
Subject: cvsserver: fix checkouts with -d <somedir>
X-Git-Tag: v1.3.0-rc1~84
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e74ee784c7daf560044dad4a06fae66732ed414b;p=git.git

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.
---

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 40b9c2af..6f10d4c9 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;
 	}