4 # .../badcommit-fixup [-- --test
5 # .../badcommit-fixup --real
15 foreach my $a (@ARGV) {
18 } elsif ($a eq '--real') {
25 die unless defined $real;
27 my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
31 no warnings qw(recursion);
34 my ($obj, $type) = @_;
35 print GCFI $obj, "\n" or die $!;
37 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
38 $gtype eq $type or die "$obj $gtype != $type ?";
40 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
41 #print STDERR ">$obj|$x|$gdata|$gsize<\n";
43 $x eq "\n" or die "$obj ($_) $!";
49 my ($data,$type) = @_;
50 my $gwopid = open2 \*GWO, \*GWI,
51 "git hash-object -w -t $type --stdin"
53 print GWI $data or die $!;
57 waitpid $gwopid,0 == $gwopid or die $!;
59 m/^(\w+)\n/ or die "$_ ?";
60 $count{"rewritten $type"}++;
66 sub rewrite_commit ($);
67 sub rewrite_commit ($) {
69 my $m = \ $memo{$obj};
70 return $$m if defined $$m;
71 my $olddata = getobj $obj, 'commit';
72 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
75 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
76 $count{'fix overwrite'} += s{^commiter }{committer }gm;
77 if (!m{^author }m && !m{^committer }m) {
78 m{^parent (\w+)}m or die "$obj ?";
79 my $parent = getobj $1, 'commit';
80 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
81 m/\n$/ or die "$obj ?";
83 $count{'fix import'}++;
85 my $newdata = $_.$msg;
87 if ($newdata eq $olddata) {
91 $newobj = hashobj $newdata, 'commit';
99 $_ = getobj $obj, 'tag';
100 m/^type (\w+)\n/m or die "$obj ?";
101 if ($1 ne 'commit') {
102 $count{"oddtags $1"}++;
105 m/^object (\w+)\n/m or die "$obj ?";
107 my $newref = rewrite_commit $oldref;
108 if ($oldref eq $newref) {
111 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
112 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
113 return hashobj $_, 'tag';
117 my $refs=`git for-each-ref`;
124 foreach my $rline (split /\n/, $refs) {
125 my ($obj, $type, $refname) =
126 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
129 if ($type eq 'commit') {
130 $rewrite = rewrite_commit($obj);
131 } elsif ($type eq 'tag') {
132 $rewrite = rewrite_tag($obj);
134 warn "ref $refname refers to $type\n";
137 next if $rewrite eq $obj;
138 push @updates, [ $refname, $obj, $rewrite ];
141 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
145 my $bare = `git rev-parse --is-bare-repository`;
147 if ($bare eq 'false') {
148 print "detaching your HEAD\n" or die $!;
149 system 'git checkout --detach' and die "$! $?";
153 for my $up (@updates) {
154 my ($ref, $old, $new) = @$up;
156 $otherref =~ s{^refs/}{};
158 print U <<END or die $!;
159 create refs/dgit-badcommit/$otherref $old
160 update $ref $new $old
163 print U <<END or die $!;
164 update refs/dgit-badfixuptest/$otherref $new
170 close U or die "$? $!";
173 print Dumper(\%count);
176 print "old values saved in refs/dgit-badcommit/\n" or die $!;
178 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;