summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-22 14:34:34 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-22 14:34:34 +0900
commit6d6e2f812d366789fb6f4f9ea8decb4777f6f862 (patch)
treeca9e7136274217cd03f2339565d7e87b91f05cea
parent31add46823fe926e85efbfeab865e366018b33b4 (diff)
parent5b4efea666951efe0770f8d5a301f8917015315f (diff)
downloadgit-6d6e2f812d366789fb6f4f9ea8decb4777f6f862.tar.gz
Merge branch 'jk/cvsimport-quoting' into maint-2.10
-rwxr-xr-xgit-cvsimport.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 1e4e65a45d..36929921ea 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -642,6 +642,7 @@ sub is_sha1 {
sub get_headref ($) {
my $name = shift;
+ $name =~ s/'/'\\''/;
my $r = `git rev-parse --verify '$name' 2>/dev/null`;
return undef unless $? == 0;
chomp $r;