From 8c8a95997cc9fe3273d71e566b09415d9198c4d2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Jan 2018 19:07:48 +0000
Subject: [PATCH] git-debrebase: parsecommit: fix confusing wrong handedness in
 breakwater merge classify

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index d32c5f30..13ff81f6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -456,8 +456,8 @@ sub classify ($) {
 	if (@p == 2 &&
 	    !$haspatches &&
 	    !$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
-	    !($p[$prevbrw]{Differs} & ~DS_DEB) &&
-	    !($p[!$prevbrw]{Differs} & ~D_UPS)) {
+	    !($p[!$prevbrw]{Differs} & ~DS_DEB) && # no non-debian changess
+	    !($p[$prevbrw]{Differs} & ~D_UPS)) { # no non-upstream changes
 	    return $classify->(qw(BreakwaterUpstreamMerge),
 			       OrigParents => [ $p[!$prevbrw] ]);
 	}
-- 
2.30.2