classify: introduce $prevbrw (nfc)

diff --git a/git-debrebase b/git-debrebase
index b2c15d6f78e26423e5216a2b3edc7cc569e84d38..a3733a989d62ee890af7a8c948fe54443c5846a5 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -398,13 +398,16 @@ sub classify ($) {
     # debian/) so debian breakwater branch should be 1st parent; that
     # way also there's also an easy rune to look for the upstream
     # patches (--topo-order).
+
+    my $prevbrw = 0;
+
     if (@p == 2 &&
        !$haspatches &&
-       !$p[0]{IsOrigin} && # breakwater merge never starts with an origin
-       !($p[0]{Differs} & ~D_DEB) &&
-       !($p[1]{Differs} & ~D_UPS)) {
+       !$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
+       !($p[$prevbrw]{Differs} & ~D_DEB) &&
+       !($p[!$prevbrw]{Differs} & ~D_UPS)) {
        return $classify->(qw(BreakwaterUpstreamMerge),
-                          OrigParents => [ $p[1] ]);
+                          OrigParents => [ $p[!$prevbrw] ]);
     }
     # xxx multi-.orig upstreams