Merge branch 'nd/shared-index-fix' into maint

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 36929921ea79006dc659f6996ae158131ccf2b73..2d8df831722913093a46e9325796b85f67a97073 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -642,7 +642,7 @@ sub is_sha1 {
 
 sub get_headref ($) {
        my $name = shift;
-       $name =~ s/'/'\\''/;
+       $name =~ s/'/'\\''/g;
        my $r = `git rev-parse --verify '$name' 2>/dev/null`;
        return undef unless $? == 0;
        chomp $r;