diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-03-10 15:35:04 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | b277db469c8d5a02132ef4a52cf2abea6305fcee (patch) | |
| tree | 0d5b2377d6dbbd69b98943da7a68943e831e1984 /git-debrebase | |
| parent | 873877b3ec9f20ebfd8ca1b8365d68c0e1f296c1 (diff) | |
git-debrebase: wip
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 1c902a2..f77566c 100755 --- a/git-debrebase +++ b/git-debrebase @@ -279,8 +279,9 @@ sub classify ($) { !($p[0]{Differs} & ~D_DEB) && !($p[1]{Differs} & ~D_UPS)) { return $classify->(qw(BreakwaterUpstreamMerge), - Upstream => $p[1]); + OrigParents => [ $p[1] ]); } + # xxx multi-.orig upstreams return $unknown->("complex merge"); } |