From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Aug 2018 12:36:35 +0000 (+0100)
Subject: git-debrebse: merge handling: Handle absence of patches via $any
X-Git-Tag: archive/debian/6.10~42
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7bd28223f931fa3f36760e73c4e32673ca7f3cbe;hp=11427376f5f4fef68225cebebda04f78faad5b01;p=dgit.git

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>
---

diff --git a/git-debrebase b/git-debrebase
index 10dadc55..4756748a 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} ], [