From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Dec 2017 19:16:26 +0000 (-0800)
Subject: Merge branch 'jk/cvsimport-quoting'
X-Git-Tag: v2.16.0-rc0~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6ae18684e1ec37c9e0e93e8e9ce98aa1babb46c0?hp=f7bbca1cae80657f0ff782e7ccace810e9e723f8

Merge branch 'jk/cvsimport-quoting'

Typo/Logico fix.

* jk/cvsimport-quoting:
cvsimport: apply shell-quoting regex globally
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 36929921ea..2d8df83172 100755
--- 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;