# [PATCH] cvsserver: fix "cvs diff" in a subdirectory 4 messages from 2006-10-10 to 2006-10-23. Participants: Johannes Schindelin, Junio C Hamano, Martin Langhoff (CatalystIT). Thread: https://gitlist.dev/t/5879 ## Johannes Schindelin, 2006-10-10 22:33 Subject: [PATCH] cvsserver: fix "cvs diff" in a subdirectory Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0610110032560.14200%40wbgn013.biozentrum.uni-wuerzburg.de ``` Signed-off-by: Johannes Schindelin --- 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 ``` ## Junio C Hamano, 2006-10-11 01:01 Subject: Re: [PATCH] cvsserver: fix "cvs diff" in a subdirectory Message-ID: <7vslhvy8bo.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vslhvy8bo.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` 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 ``` ## Johannes Schindelin, 2006-10-11 08:17 Subject: Re: [PATCH] cvsserver: fix "cvs diff" in a subdirectory Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0610111017400.14200%40wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: <7vslhvy8bo.fsf@assigned-by-dhcp.cox.net> ``` 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 ``` ## Martin Langhoff (CatalystIT), 2006-10-23 06:11 Subject: Re: [PATCH] cvsserver: fix "cvs diff" in a subdirectory Message-ID: <453C5D17.4010209@catalyst.net.nz> URL: https://gitlist.dev/e/453C5D17.4010209%40catalyst.net.nz In-Reply-To: <7vslhvy8bo.fsf@assigned-by-dhcp.cox.net> ``` 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 ----------------------------------------------------------------------- ```