From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 18 Feb 2008 20:29:25 GMT
Subject: Re: [PATCH] cvsexportcommit: be graceful when "cvs status" reorders the arguments
Message-ID: <alpine.LSU.1.00.0802182025340.30505@racer.site>
In-Reply-To: <47B9E561.8040605@catalyst.net.nz>

Hi,

On Tue, 19 Feb 2008, Martin Langhoff wrote:

> Johannes Schindelin wrote:
>
> > Well, please try for yourself.  If it works for you, then I probably 
> > had another error in my patch.
> 
> $ perl -MFile::Basename -e 'print basename("/foo/bar/baz");'
> baz
> 
> Johannes, what are you smoking? No PUI here! ;-)

Unfortunately, I am not smoking, because my throat is inflamed...

Checked again, and sure enough, it works.  So, this is a replacement patch 
to be squashed in... So: I'm sorry...

Ciao,
Dscho

-- snipsnap --
 git-cvsexportcommit.perl |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index c00368b..b8114f7 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -207,8 +207,7 @@ if (@canstatusfiles) {
       my @canstatusfiles2 = ();
       my %fullname = ();
       foreach my $name (keys %todo) {
-	my $basename = $name;
-	$basename =~ s/.*\///;
+	my $basename = basename($name);
 	$basename = "no file " . $basename if (exists($added{$basename}));
 	chomp($basename);