Skip to content

Commit dca89d4

Browse files
committed
Merge branch 'jk/safe-pipe-capture' into maint-2.10
2 parents 6d6e2f8 + 8d0fad0 commit dca89d4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-archimport.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ sub find_parents {
983983
# check that we actually know about the branch
984984
next unless -e "$git_dir/refs/heads/$branch";
985985

986-
my $mergebase = `git-merge-base $branch $ps->{branch}`;
986+
my $mergebase = safe_pipe_capture(qw(git-merge-base), $branch, $ps->{branch});
987987
if ($?) {
988988
# Don't die here, Arch supports one-way cherry-picking
989989
# between branches with no common base (or any relationship
@@ -1074,7 +1074,7 @@ sub find_parents {
10741074

10751075
sub git_rev_parse {
10761076
my $name = shift;
1077-
my $val = `git-rev-parse $name`;
1077+
my $val = safe_pipe_capture(qw(git-rev-parse), $name);
10781078
die "Error: git-rev-parse $name" if $?;
10791079
chomp $val;
10801080
return $val;

0 commit comments

Comments
 (0)