From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Tue, 10 Oct 2006 22:33:28 +0000 (+0200)
Subject: cvsserver: fix "cvs diff" in a subdirectory
X-Git-Tag: v1.4.3-rc3~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d988b82232bb8f5826a1619fd4dcba1a5a330f27;p=git.git

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 4de50d029..08ad831a3 100755
--- 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/ );
 
-    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};