From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Jan 2018 19:07:48 +0000 (+0000)
Subject: git-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify
X-Git-Tag: archive/debian/5.0~288
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8c8a95997cc9fe3273d71e566b09415d9198c4d2;hp=96df45ea01695234877e93ed6e1eceac2d2c18aa

git-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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] ]);
 	}