diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:15 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:15 +0900 |
| commit | 25fc9ef35e9544c5fe62c8c6379ce828bdc975b2 (patch) | |
| tree | 82abd85ecc8e05c398fbfe11a483224788a9b3e7 /git-archimport.perl | |
| parent | 2376b62f539bf17c1458795e0cea9c9df4b4927d (diff) | |
| download | git-25fc9ef35e9544c5fe62c8c6379ce828bdc975b2.tar.gz git-25fc9ef35e9544c5fe62c8c6379ce828bdc975b2.tar.bz2 git-25fc9ef35e9544c5fe62c8c6379ce828bdc975b2.zip | |
Imported Upstream version 2.14.0upstream/2.14.0
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 b7c173c3..9cb123a0 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 = safe_pipe_capture(qw(git-merge-base), $branch, $ps->{branch}); + my $mergebase = `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 = safe_pipe_capture(qw(git-rev-parse), $name); + my $val = `git-rev-parse $name`; die "Error: git-rev-parse $name" if $?; chomp $val; return $val; |