cvsserver: fix "cvs diff" in a subdirectory

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 4de50d029d908698687ebd07d24745bda33e89f2..08ad831a3900d4ac0bc04b4e9bd371ffcb54e1ae 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -275,7 +275,7 @@ sub req_Directory
     $state->{directory} = "" if ( $state->{directory} eq "." );
     $state->{directory} .= "/" if ( $state->{directory} =~ /\S/ );
 
     $state->{directory} = "" if ( $state->{directory} eq "." );
     $state->{directory} .= "/" if ( $state->{directory} =~ /\S/ );
 

-    if ( not defined($state->{prependdir}) and $state->{localdir} eq "." and $state->{path} =~ /\S/ )
+    if ( (not defined($state->{prependdir}) or $state->{prependdir} eq '') and $state->{localdir} eq "." and $state->{path} =~ /\S/ )

     {
         $log->info("Setting prepend to '$state->{path}'");
         $state->{prependdir} = $state->{path};
     {
         $log->info("Setting prepend to '$state->{path}'");
         $state->{prependdir} = $state->{path};