chiark / gitweb /
abolish abbrev thing
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 5 Apr 2017 17:20:03 +0000 (18:20 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 24 Aug 2017 14:43:39 +0000 (15:43 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 57b5efd8ae53c9df82c5c9860e8aef3c19be2a02..4cfcae8fc449b32156b591495a2aaa60f0a7a7f5 100755 (executable)
@@ -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