X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=ad2672f1cd3e4f7633af0ee3b05874b6f06e80b5;hp=a853c0639c1cf1f0daad4f891e0c3838c1912b87;hb=da894f5bc73ad2a5cbf6d74533818ca359f141b0;hpb=e00c330eb5a8f42129fe1f2010f28b62780b0a68

diff --git a/git-debrebase b/git-debrebase
index a853c063..ad2672f1 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -442,7 +442,7 @@ sub classify ($) {
 	my @overwritten = grep { $_->{Differs} } @p;
 	confess "internal error $objid ?" unless @overwritten==1;
 	return $classify->(qw(Pseudomerge),
-			   Overwritten => $overwritten[0],
+			   Overwritten => [ $overwritten[0] ],
 			   Contributor => $identical[0]);
     }
     if (@p == 2 && @identical == 2) {
@@ -453,7 +453,7 @@ sub classify ($) {
 	} @p;
 	return $classify->(qw(Pseudomerge),
 			   SubType => qw(Ambiguous),
-			   Overwritten => $bytime[0],
+			   Overwritten => [ $bytime[0] ],
 			   Contributor => $bytime[1]);
     }
     foreach my $p (@p) {
@@ -627,7 +627,8 @@ sub walk ($;$$) {
 		# suite intended by the non-dgit NMUer, and later
 		# pseudomerges may represent in-archive copies.
 		my $ovwrs = $pm->{Overwritten};
-		printf $report " PM=%s \@Overwr:%d", $pm, (scalar @$ovwrs)
+		printf $report " PM=%s \@Overwr:%d",
+		    $pm->{CommitId}, (scalar @$ovwrs)
 		    if $report;
 		if (@$ovwrs != 1) {
                     printdebug "*** WALK BOMB DgitImportUnpatched\n";
@@ -650,22 +651,12 @@ sub walk ($;$$) {
 		    %$cl,
 		    SpecialMethod => 'DgitImportDebianUpdate',
                     $xmsg->("convert dgit import: debian changes")
+		}, {
+		    %$cl,
+		    SpecialMethod => 'DgitImportUpstreamUpdate',
+                    $xmsg->("convert dgit import: upstream update",
+			    " breakwater")
 		};
-		my $differs = (get_differs $ovwr, $cl->{Tree});
-		printf $report " Differs=%#x", $differs if $report;
-		if ($differs & D_UPS) {
-		    printf $report " D_UPS" if $report;
-		    # This will also trigger if a non-dgit git-based NMU
-		    # deleted .gitignore (which is a thing that some of
-		    # the existing git tools do if the user doesn't
-		    # somehow tell them not to).  Ah well.
-		    push @brw_cl, {
-			%$cl,
-			SpecialMethod => 'DgitImportUpstreamUpdate',
-		        $xmsg->("convert dgit import: upstream changes",
-				" breakwater")
-		    };
-		}
 		$prline->(" Import");
 		$rewrite_from_here->();
 		$upp_limit //= $#upp_cl; # further, deeper, patches discarded
@@ -748,6 +739,9 @@ sub walk ($;$$) {
 		$read_tree_debian->($cltree);
 		rm_subdir_cached qw(debian/patches);
 	    } elsif ($method eq 'DgitImportUpstreamUpdate') {
+ 		confess unless $rewriting;
+		my $differs = (get_differs $build, $cltree);
+		next unless $differs & D_UPS;
 		$read_tree_upstream->($cltree);
 		push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
 	    } else {