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
commitdca89d4e56dde4b9b48d6f2ec093886a6fa46575 (patch)
tree99a3945acc9a598a3f3b58d9ae012f910d9a24c7
parent6d6e2f812d366789fb6f4f9ea8decb4777f6f862 (diff)
parent8d0fad0a7a6ba34fd706c148fa7ed1f8eb2b8b26 (diff)
downloadgit-dca89d4e56dde4b9b48d6f2ec093886a6fa46575.tar.gz
Merge branch 'jk/safe-pipe-capture' into maint-2.10
-rwxr-xr-xgit-archimport.perl4
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;