From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 20:21:51 +0000 (+0000)
Subject: git-debrebase: fix Overwritten to be an array like it says, etc.
X-Git-Tag: archive/debian/5.0~205
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=cd2fb073d878511939ff074c19729acf6d598365

git-debrebase: fix Overwritten to be an array like it says, etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index a853c063..bdde809d 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";