aboutsummaryrefslogtreecommitdiffstats
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-26 14:15:55 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-26 14:15:55 +0900
commit7451fcdc0d3cffdb9aa79d2651830b44a8e052d6 (patch)
tree2bb05e00cf7a150c6aff0a7c17966d6450e0c4a1 /git-cvsimport.perl
parentThe ninth batch for 2.15 (diff)
parentGit 2.14.2 (diff)
downloadgit-7451fcdc0d3cffdb9aa79d2651830b44a8e052d6.tar.gz
git-7451fcdc0d3cffdb9aa79d2651830b44a8e052d6.zip
Sync with 2.14.2
* maint: Git 2.14.2 Git 2.13.6 Git 2.12.5 Git 2.11.4 Git 2.10.5 cvsimport: shell-quote variable used in backticks archimport: use safe_pipe_capture for user input shell: drop git-cvsserver support by default cvsserver: use safe_pipe_capture for `constant commands` as well cvsserver: use safe_pipe_capture instead of backticks cvsserver: move safe_pipe_capture() to the main package
Diffstat (limited to 'git-cvsimport.perl')
-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;