X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=f77566c9efd482e17c8f490bd5f2c054a861aad8;hb=b277db469c8d5a02132ef4a52cf2abea6305fcee;hp=1c902a262266db30d864c2e10d79c6180e692947;hpb=873877b3ec9f20ebfd8ca1b8365d68c0e1f296c1;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 1c902a26..f77566c9 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");
 }