diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:07 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:07 +0900 |
| commit | 13d380c8c857b57c44ebb2132ba3737d1c826143 (patch) | |
| tree | bd2422eee9e0d10902ccc4cb63aa2756ba4eaf90 /git-archimport.perl | |
| parent | 5d316691e937eef875f599c804c12fb79f12078a (diff) | |
| download | git-13d380c8c857b57c44ebb2132ba3737d1c826143.tar.gz git-13d380c8c857b57c44ebb2132ba3737d1c826143.tar.bz2 git-13d380c8c857b57c44ebb2132ba3737d1c826143.zip | |
Imported Upstream version 2.12.5upstream/2.12.5
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 9cb123a0..b7c173c3 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; |