diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 13:36:35 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 13:36:35 +0100 |
| commit | 7bd28223f931fa3f36760e73c4e32673ca7f3cbe (patch) | |
| tree | 6f1cf6118ff7e15839f45355cda469001b135a58 /git-debrebase | |
| parent | 11427376f5f4fef68225cebebda04f78faad5b01 (diff) | |
git-debrebse: merge handling: Handle absence of patches via $any
This saves testing for $seriesfile existence and makes the code
slightly less tangled.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase index 10dadc5..4756748 100755 --- a/git-debrebase +++ b/git-debrebase @@ -603,9 +603,10 @@ sub merge_series ($$$;@) { playtree_setup(); foreach my $q ($base_q, reverse @input_qs) { my $s = $q->{MR}{S}; - gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip}; + my $any = gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip}; my @earlier; - if (open S, $seriesfile) { + if ($any) { + open S, $seriesfile or die "$seriesfile $!"; while (my $patch = <S>) { chomp $patch or die $!; $prereq{$patch} //= {}; @@ -617,8 +618,6 @@ sub merge_series ($$$;@) { } S->error and die "$seriesfile $!"; close S; - } else { - die "$seriesfile $!" unless $!==ENOENT; } read_tree_upstream $newbase, 1; my $pec = make_commit [ grep { defined } $base_q->{MR}{PEC} ], [ |