From: Damien Diederen <dash@foobox.net>
Date: Thu, 27 Mar 2008 22:17:53 +0000 (+0100)
Subject: cvsserver: Do not include status output for subdirectories if -l is passed
X-Git-Tag: v1.5.5-rc3~6^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=852b921c78ca33606600d7fd45e573a8435dbcb8;p=git.git

cvsserver: Do not include status output for subdirectories if -l is passed

This effectively implements the -l switch by pruning the entries whose
filenames contain a path separator.  It was previously ignored.

Without this, TkCVS includes strange "ghost" entries in its directory
listings.

Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 444ec0db7..89a4dac29 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -1428,6 +1428,8 @@ sub req_status
     {
         $filename = filecleanup($filename);
 
+        next if exists($state->{opt}{l}) && index($filename, '/', length($state->{prependdir})) >= 0;
+
         my $meta = $updater->getmeta($filename);
         my $oldmeta = $meta;