X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=e000e55624b3f2c5e94e3898c09c2d9642ab5b0f;hp=8c1dba80b881d257ca161305aa63c33e990272da;hb=617ac680360b4375ee15c7895ad192a62e446e5a;hpb=60b4f46cf0a103089163736e6fbf5b2fd62960aa diff --git a/git-debrebase b/git-debrebase index 8c1dba80..e000e556 100755 --- a/git-debrebase +++ b/git-debrebase @@ -324,14 +324,11 @@ sub walk ($$$;$$$) { $report->($cl); $found{$ty. ( defined($st) ? "-$st" : '' )}++; my $p0 = $cl->{Parents}[0]{CommitId}; - $cl->{Abbrev} = lc substr $ty,0,1; if ($ty eq 'AddPatches') { - $cl->{Abbrev} = 'P'; $cur = $p0; $rewrite_from_here->(); next; } elsif ($ty eq 'Packaging') { - $cl->{Abbrev} = 'd'; push @deb_cl, $cl; push @processed, $cl; $cur = $p0; @@ -352,7 +349,6 @@ sub walk ($$$;$$$) { $rewrite_from_here->(); next; } elsif ($ty eq 'Pseudomerge') { - $cl->{Abbrev} = 'M'; if (defined $pseudos_must_overwrite_this && !grep { is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId} @@ -372,7 +368,6 @@ sub walk ($$$;$$$) { last; } elsif ($ty eq 'DgitImportUnpatched' && @pseudomerges == 1) { - $cl->{Abbrev} = 'I'; # This import has a tree which is just like a breakwater # tree, but it has the wrong history. Its ought to have # the previous breakwater (which dgit ought to have