undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/safe-pipe-capture' into maint-2.10

Browse Source
This commit is contained in:
Junio C Hamano 2017-09-22 14:34:34 +09:00
commit dca89d4e56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-archimport.perl
View File

@ -983,7 +983,7 @@ sub find_parents {
# check that we actually know about the branch # check that we actually know about the branch
next unless -e "$git_dir/refs/heads/$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 ($?) { if ($?) {
# Don't die here, Arch supports one-way cherry-picking # Don't die here, Arch supports one-way cherry-picking
# between branches with no common base (or any relationship # between branches with no common base (or any relationship
@ -1074,7 +1074,7 @@ sub find_parents {
sub git_rev_parse { sub git_rev_parse {
my $name = shift; 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 $?; die "Error: git-rev-parse $name" if $?;
chomp $val; chomp $val;
return $val; return $val;