diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-26 14:15:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-26 14:15:55 +0900 |
| commit | 7451fcdc0d3cffdb9aa79d2651830b44a8e052d6 (patch) | |
| tree | 2bb05e00cf7a150c6aff0a7c17966d6450e0c4a1 /git-archimport.perl | |
| parent | The ninth batch for 2.15 (diff) | |
| parent | Git 2.14.2 (diff) | |
| download | git-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-archimport.perl')
| -rwxr-xr-x | git-archimport.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-archimport.perl b/git-archimport.perl index 9cb123a07d..b7c173c345 100755 --- a/git-archimport.perl +++ b/git-archimport.perl @@ -983,7 +983,7 @@ sub find_parents { # check that we actually know about the branch next unless -e "$git_dir/refs/heads/$branch"; - my $mergebase = `git-merge-base $branch $ps->{branch}`; + my $mergebase = safe_pipe_capture(qw(git-merge-base), $branch, $ps->{branch}); if ($?) { # Don't die here, Arch supports one-way cherry-picking # between branches with no common base (or any relationship @@ -1074,7 +1074,7 @@ sub find_parents { sub git_rev_parse { my $name = shift; - my $val = `git-rev-parse $name`; + my $val = safe_pipe_capture(qw(git-rev-parse), $name); die "Error: git-rev-parse $name" if $?; chomp $val; return $val; |