[PATCH] cvsserver: fix "cvs diff" in a subdirectory

[PATCH] cvsserver: fix "cvs diff" in a subdirectory

[Johannes Schindelin]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
 git-cvsserver.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 7260f32..da00432 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -277,7 +277,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};
-- 
1.4.3.rc2.g55b2-dirty

Re: [PATCH] cvsserver: fix "cvs diff" in a subdirectory

[Junio C Hamano]

Will park this and the "U for update, M for modified" patch in
"pu", waiting for acks from actual git-cvsserver users.  It
feels it is safe enough change, so with an Ack from Mart[yi]n
it may be woth having it in 1.4.3

Re: [PATCH] cvsserver: fix "cvs diff" in a subdirectory

[Johannes Schindelin]

Hi,

On Tue, 10 Oct 2006, Junio C Hamano wrote:

> Will park this and the "U for update, M for modified" patch in
> "pu", waiting for acks from actual git-cvsserver users.  It
> feels it is safe enough change, so with an Ack from Mart[yi]n
> it may be woth having it in 1.4.3

Thanks.

Ciao,
Dscho

Re: [PATCH] cvsserver: fix "cvs diff" in a subdirectory

[Martin Langhoff (CatalystIT)]

Junio C Hamano wrote:

> Will park this and the "U for update, M for modified" patch in
> "pu", waiting for acks from actual git-cvsserver users.  It
> feels it is safe enough change, so with an Ack from Mart[yi]n
> it may be woth having it in 1.4.3

Late late Ack. Sorry about the delay. I see it's in master already ;-)

cheers,


martin
-- 
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ  Ltd, PO Box 11-053, Manners St,  Wellington
WEB: http://catalyst.net.nz/           PHYS: Level 2, 150-154 Willis St
OFFICE: +64(4)916-7224                              MOB: +64(21)364-017
       Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------