From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 14 May 2008 22:30:43 +0000 (+0100)
Subject: cvsexportcommit: chomp only removes trailing whitespace
X-Git-Tag: v1.5.6-rc0~11^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57e0e3ebd6fac2bf5fe46fd946dae6129b07f474;p=git.git

cvsexportcommit: chomp only removes trailing whitespace

In commit fef3a7cc(cvsexportcommit: be graceful when "cvs status"
reorders the arguments), caution was taken to get the status even
for files with leading or trailing whitespace.

However, the author of that commit missed that chomp() removes only
trailing newlines.  With help of the mailing list, the author realized
his mistake and provided this patch.

The idea is that we do not want to rely on a certain layout of the
output of "cvs status".  Therefore we only call it with files that are
unambiguous after stripping leading and trailing whitespace.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index b6036bd4d..317a89027 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -210,7 +210,8 @@ if (@canstatusfiles) {
 	my $basename = basename($name);
 
 	$basename = "no file " . $basename if (exists($added{$basename}));
-	chomp($basename);
+	$basename =~ s/^\s+//;
+	$basename =~ s/\s+$//;
 
 	if (!exists($fullname{$basename})) {
 	  $fullname{$basename} = $name;