From 78dfec329693691f0ff468e444d7ae19aec220d1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 25 Aug 2017 10:44:04 +0100
Subject: [PATCH] git-debrebase: classify: introduce $prevbrw (nfc)

---
 git-debrebase | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index b2c15d6f..a3733a98 100755
--- 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
 
-- 
2.30.2