3 # Script to help with fallout from #849041.
6 # dgit-badcommit-fixup --test
7 # dgit-badcommit-fixup --real
17 foreach my $a (@ARGV) {
20 } elsif ($a eq '--real') {
27 die unless defined $real;
29 my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
33 no warnings qw(recursion);
36 system @_ and die "@_ $! $?";
40 my $bare = `git rev-parse --is-bare-repository`;
45 my ($obj, $type) = @_;
46 print GCFI $obj, "\n" or die $!;
48 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
49 $gtype eq $type or die "$obj $gtype != $type ?";
51 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
53 $x eq "\n" or die "$obj ($_) $!";
59 my ($data,$type) = @_;
60 my $gwopid = open2 \*GWO, \*GWI,
61 "git hash-object -w -t $type --stdin"
63 print GWI $data or die $!;
67 waitpid $gwopid,0 == $gwopid or die $!;
69 m/^(\w+)\n/ or die "$_ ?";
70 $count{"rewritten $type"}++;
76 sub rewrite_commit ($);
77 sub rewrite_commit ($) {
79 my $m = \ $memo{$obj};
80 return $$m if defined $$m;
81 my $olddata = getobj $obj, 'commit';
82 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
85 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
86 $count{'fix overwrite'} += s{^commiter }{committer }gm;
87 if (!m{^author }m && !m{^committer }m) {
88 m{^parent (\w+)}m or die "$obj ?";
89 my $parent = getobj $1, 'commit';
90 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
91 m/\n$/ or die "$obj ?";
93 $count{'fix import'}++;
95 my $newdata = $_.$msg;
97 if ($newdata eq $olddata) {
101 $newobj = hashobj $newdata, 'commit';
109 sub filter_updates () {
110 @updates = grep { $_->[1] ne $_->[2] } @updates;
113 sub rewrite_tag ($) {
115 $_ = getobj $obj, 'tag';
116 m/^type (\w+)\n/m or die "$obj ?";
117 if ($1 ne 'commit') {
118 $count{"oddtags $1"}++;
121 m/^object (\w+)\n/m or die "$obj ?";
123 my $newref = rewrite_commit $oldref;
124 if ($oldref eq $newref) {
127 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
128 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
129 return hashobj $_, 'tag';
132 sub rewrite_rewrite_map ($) {
135 my $td = 'dgit-broken-fixup.tmp';
136 runcmd qw(rm -rf), $td;
137 mkdir $td, 0700 or die "$td $!";
139 runcmd qw(git init -q);
140 runcmd qw(git config gc.auto 0);
141 runcmd qw(rm -rf .git/objects);
142 symlink "../../objects", ".git/objects" or die $!;
147 runcmd qw(git checkout -q), $old;
148 open M, "map" or die $!;
150 m/^(\w+)(?:\s+(\w+))?$/ or die;
152 $count{rewrite_map_previous}++;
159 foreach my $up (@updates) {
160 $map{ $_->[1] } = $_->[2];
163 open M, ">", "map" or die $!;
165 $_, (defined $map{$_} ? " $map{$_}" : "")
170 runcmd qw(git commit -q),
171 qw(-m), 'dgit-badcommit-fixup',
175 my $new = `git rev-parse HEAD`;
179 chdir '..' or die $!;
180 runcmd qw(rm -rf), $td;
182 $count{rewrite_map_updated}++;
188 my $refs=`git for-each-ref`;
193 our $org_rewrite_map;
195 foreach my $rline (split /\n/, $refs) {
196 my ($obj, $type, $refname) =
197 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
199 if ($refname eq 'refs/dgit-rewrite-map') {
200 $org_rewrite_map = $obj;
204 if ($type eq 'commit') {
205 $rewrite = rewrite_commit($obj);
206 } elsif ($type eq 'tag') {
207 $rewrite = rewrite_tag($obj);
209 warn "ref $refname refers to $type\n";
212 push @updates, [ $refname, $obj, $rewrite ];
215 if ($bare eq 'true') {
216 my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
217 push @updates, [ 'refs/dgit-rewrite-map',
218 ($org_rewrite_map // '0'x40),
224 #print Dumper(\@updates);
226 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
228 if ($real && $bare eq 'false') {
229 print "detaching your HEAD\n" or die $!;
230 runcmd 'git checkout --detach';
233 for my $up (@updates) {
234 my ($ref, $old, $new) = @$up;
236 $otherref =~ s{^refs/}{};
238 print U <<END or die $!;
239 create refs/dgit-badcommit/$otherref $old
240 update $ref $new $old
243 print U <<END or die $!;
244 update refs/dgit-badfixuptest/$otherref $new
250 close U or die "$? $!";
253 print Dumper(\%count);
256 print "old values saved in refs/dgit-badcommit/\n" or die $!;
258 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;