#!/usr/bin/perl -w
+# usage:
+# .../badcommit-fixup --test
+# .../badcommit-fixup --real
+
use strict;
use POSIX;
use IPC::Open2;
use Data::Dumper;
+die unless "@ARGV" eq "--test" or "@ARGV" eq "--real";
+
+my ($modeopt) = @ARGV;
+my $real = ($modeopt eq '--real');
+
my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
our %count;
sub hashobj ($$) {
my ($data,$type) = @_;
my $gwopid = open2 \*GWO, \*GWI,
- "git hash-object -t $type --stdin"
+ "git hash-object -w -t $type --stdin"
or die $!;
print GWI $data or die $!;
close GWI or die $!;
my $msg = $';
$_ = $`;
s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
- $count{fix_overwrite} += s{^commiter }{committer }gm;
+ $count{'fix overwrite'} += s{^commiter }{committer }gm;
if (!m{^author }m && !m{^committer }m) {
m{^parent (\w+)}m or die "$obj ?";
my $parent = getobj $1, 'commit';
$parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
m/\n$/ or die "$obj ?";
$_ .= $1;
- $count{fix_import}++;
+ $count{'fix import'}++;
}
my $newdata = $_.$msg;
my $newobj;
m/^type (\w+)\n/m or die "$obj ?";
if ($1 ne 'commit') {
$count{"oddtags $1"}++;
- return;
+ return $obj;
}
m/^object (\w+)\n/m or die "$obj ?";
my $oldref = $1;
}
$!=0; $?=0;
-my $refs=`git-for-each-ref`;
+my $refs=`git for-each-ref`;
die "$? $!" if $?;
chomp $refs;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
} elsif ($type eq 'tag') {
- my $rewrite = rewrite_tag($obj);
+ $rewrite = rewrite_tag($obj);
} else {
warn "ref $refname refers to $type\n";
next;
}
- next if $rewrite = $obj;
- push @updates, [ $refname, $rewrite ];
+ next if $rewrite eq $obj;
+ push @updates, [ $refname, $obj, $rewrite ];
+}
+
+open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
+
+if ($real) {
+ $!=0; $?=0;
+ my $bare = `git rev-parse --is-bare-repository`;
+ die "$? $!" if $?;
+ if ($bare eq 'false') {
+ print "detaching your HEAD\n" or die $!;
+ system 'git checkout --detach' and die "$! $?";
+ }
}
-print Dumper(\@updates, \%count);
+for my $up (@updates) {
+ my ($ref, $old, $new) = @$up;
+ my $otherref = $ref;
+ $otherref =~ s{^refs/}{};
+ if ($real) {
+ print U <<END or die $!;
+create refs/dgit-badcommit/$otherref $old
+update $ref $new $old
+END
+ } else {
+ print U <<END or die $!;
+update refs/dgit-badfixuptest/$otherref $new
+END
+ }
+}
+
+$?=0; $!=0;
+close U or die "$? $!";
+die $? if $?;
+
+print Dumper(\%count);
+
+if ($real) {
+ print "old values saved in refs/dgit-badcommit/\n" or die $!;
+} else {
+ print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;
+}