diff options
Diffstat (limited to 'git-debrebase')
-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] ]); } |