diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-30 19:07:48 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | 8c8a95997cc9fe3273d71e566b09415d9198c4d2 (patch) | |
| tree | d2ff7025dada9058815840a7842d20fef3fae5b6 | |
| parent | 96df45ea01695234877e93ed6e1eceac2d2c18aa (diff) | |
git-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | git-debrebase | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index d32c5f3..13ff81f 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] ]); } |