git-debrebase: abolish abbrev thing

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 4cd2203ac03d7e2586f797fe5428a35a6af175d9..e000e55624b3f2c5e94e3898c09c2d9642ab5b0f 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -286,7 +286,7 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub launder ($$$;$$$) {
+sub walk ($$$;$$$) {
     my ($input, $pseudos_must_overwrite_this, $wantdebonly,
        $report, $depth, $report_anomaly, $nogenerate) = @_;
     # go through commits backwards
@@ -324,14 +324,11 @@ sub launder ($$$;$$$) {
        $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 launder ($$$;$$$) {
            $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 launder ($$$;$$$) {
            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