From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Robin Rosenberg <robin.rosenberg@dewire.com>, git@vger.kernel.org
Subject: [PATCH 1/2 v2] cvsexportcommit: chomp only removes trailing whitespace
Date: Wed, 14 May 2008 23:30:43 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0805142327520.30431@racer> (raw)
In-Reply-To: <alpine.DEB.1.00.0805141936410.30431@racer>
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>
---
On Wed, 14 May 2008, Johannes Schindelin wrote:
> To prevent bad things from happening, the status is checked on a
> set of files which have unique names with regard to the chomp()ed
> name (well, whatever we do to the name, really).
>
> So yes, this patch needs an update.
>
> Will do so in a couple of hours,
And so I did.
git-cvsexportcommit.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index b6036bd..52ba7de 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -210,7 +210,7 @@ if (@canstatusfiles) {
my $basename = basename($name);
$basename = "no file " . $basename if (exists($added{$basename}));
- chomp($basename);
+ $basename =~ s/^\s+(.*?)\s*$/$1/;
if (!exists($fullname{$basename})) {
$fullname{$basename} = $name;
--
1.5.5.1.375.g1becb
next prev parent reply other threads:[~2008-05-14 22:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-14 14:27 [PATCH 1/2] cvsexportcommit: chomp only removes trailing whitespace Johannes Schindelin
2008-05-14 14:29 ` [PATCH 2/2] cvsexportcommit: introduce -W for shared working trees (between Git and CVS) Johannes Schindelin
2008-05-14 17:58 ` [PATCH 1/2] cvsexportcommit: chomp only removes trailing whitespace Junio C Hamano
2008-05-14 18:38 ` Johannes Schindelin
2008-05-14 20:06 ` Robin Rosenberg
2008-05-14 22:15 ` Johannes Schindelin
2008-05-14 22:30 ` Johannes Schindelin [this message]
2008-05-15 2:27 ` [PATCH 1/2 v2] " Junio C Hamano
2008-05-15 3:21 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.1.00.0805142327520.30431@racer \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robin.rosenberg@dewire.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox