chiark / gitweb /
git-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 30 Jan 2018 19:07:48 +0000 (19:07 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index d32c5f3..13ff81f 100755 (executable)
@@ -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] ]);
        }