Merge branch 'nd/struct-pathspec'

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index a36df3392652b8a854ca48bdf71977dcf12b244b..39a426e067c76e01d3f2a0d63243ec494436da46 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -1,6 +1,8 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
+use 5.008;
 use strict;
+use warnings;
 use Getopt::Std;
 use File::Temp qw(tempdir);
 use Data::Dumper;
@@ -259,7 +261,8 @@
            if $file =~ /^no file /
                && $status eq 'Up-to-date';
 
-       $cvsstat{$fullname{$file}} = $status;
+       $cvsstat{$fullname{$file}} = $status
+           if defined $fullname{$file};
       }
     }
 }
@@ -299,7 +302,7 @@
        while (<FILTER_IN>)
        {
            my $line = $_;
-           $line =~ s/\$([A-Z][a-z]+):[^\$]+\$/\$\1\$/g;
+           $line =~ s/\$([A-Z][a-z]+):[^\$]+\$/\$$1\$/g;
            print FILTER_OUT $line;
        }
        close FILTER_IN;