diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-16 20:21:51 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:03:11 +0100 |
| commit | cd2fb073d878511939ff074c19729acf6d598365 (patch) | |
| tree | b27659a533c039c0e7a43ae11b65f4436fc23687 /git-debrebase | |
| parent | c53c58baf0425eaa76826725264dc909b46a4f7c (diff) | |
git-debrebase: fix Overwritten to be an array like it says, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index a853c06..bdde809 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"; |