if ($newdata eq $olddata) {
$newobj = $obj;
$count{unchanged}++;
+#print STDERR "UNCHANGED $obj\n";
} else {
$newobj = hashobj $newdata, 'commit';
+#print STDERR "REWRITTEN $obj $newobj\n";
}
$$m= $newobj;
return $newobj;
}
+our @updates;
+
+sub filter_updates () {
+ @updates = grep { $_->[1] ne $_->[2] } @updates;
+}
+
sub rewrite_tag ($) {
my ($obj) = @_;
$_ = getobj $obj, 'tag';
return hashobj $_, 'tag';
}
+sub edit_rewrite_map ($) {
+ my ($old) = @_;
+
+ filter_updates();
+ return $old unless @updates;
+
+ my $td = 'dgit-broken-fixup.tmp';
+ runcmd qw(rm -rf), $td;
+ mkdir $td, 0700 or die "$td $!";
+ chdir $td or die $!;
+ runcmd qw(git init -q);
+ runcmd qw(git config gc.auto 0);
+ runcmd qw(rm -rf .git/objects);
+ symlink "../../objects", ".git/objects" or die $!;
+
+ my %map;
+
+ if ($old) {
+ runcmd qw(git checkout -q), $old;
+ open M, "map" or die $!;
+ while (<M>) {
+ m/^(\w+)(?:\s+(\w+))?$/ or die;
+ $map{$1} = $2;
+ $count{rewrite_map_previous}++;
+ }
+ M->error and die $!;
+ close M or die $!;
+ }
+
+ foreach my $oldc (keys %memo) {
+ my $newc = $memo{$oldc};
+ next if $oldc eq $newc;
+ $map{$oldc} = $newc;
+ }
+ foreach my $up (@updates) { # catches tags
+ $map{ $up->[1] } = $up->[2];
+ }
+
+ open M, ">", "map" or die $!;
+ printf M "%s%s\n",
+ $_, (defined $map{$_} ? " $map{$_}" : "")
+ or die $!
+ foreach keys %map;
+ close M or die $!;
+
+ if (!$old) {
+ runcmd qw(git add map);
+ }
+
+ runcmd qw(git commit -q),
+ qw(-m), 'dgit-badcommit-fixup',
+ qw(map);
+
+ $!=0; $?=0;
+ my $new = `git rev-parse HEAD`;
+ die "$? $!" if $?;
+ chomp $new or die;
+
+ chdir '..' or die $!;
+ runcmd qw(rm -rf), $td;
+
+ $count{rewrite_map_updated}++;
+
+ return $new;
+}
+
$!=0; $?=0;
my $refs=`git for-each-ref`;
die "$? $!" if $?;
chomp $refs;
-our @updates;
+our $org_rewrite_map;
foreach my $rline (split /\n/, $refs) {
my ($obj, $type, $refname) =
$rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
or die "$_ ?";
+ if ($refname eq 'refs/dgit-rewrite/map') {
+ $org_rewrite_map = $obj;
+ continue;
+ }
my $rewrite;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
warn "ref $refname refers to $type\n";
next;
}
- next if $rewrite eq $obj;
push @updates, [ $refname, $obj, $rewrite ];
}
-our $worktree;
+if ($bare eq 'true') {
+ my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
+ push @updates, [ 'refs/dgit-rewrite/map',
+ ($org_rewrite_map // '0'x40),
+ ($new_rewrite_map // '0'x40),
+ 1 ];
+}
+
+filter_updates();
+
+if (!@updates) {
+ print Dumper(\%count), "nothing to do\n";
+ exit 0;
+}
#print Dumper(\@updates);
}
for my $up (@updates) {
- my ($ref, $old, $new) = @$up;
+ my ($ref, $old, $new, $nobackup) = @$up;
my $otherref = $ref;
$otherref =~ s{^refs/}{};
if ($real) {
- print U <<END or die $!;
+ print U <<END or die $! unless $nobackup;
create refs/dgit-badcommit/$otherref $old
+END
+ print U <<END or die $!;
update $ref $new $old
END
} else {