1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
#!/usr/bin/perl -w
#
# Script to help with fallout from #849041.
#
# usage:
# dgit-badcommit-fixup --test
# dgit-badcommit-fixup --real
use strict;
use POSIX;
use IPC::Open2;
use Data::Dumper;
my $real;
foreach my $a (@ARGV) {
if ($a eq '--test') {
$real = 0;
} elsif ($a eq '--real') {
$real = 1;
} else {
die "$a ?";
}
}
die unless defined $real;
my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
our %count;
no warnings qw(recursion);
sub runcmd {
system @_ and die "@_ $! $?";
}
$!=0; $?=0;
my $bare = `git rev-parse --is-bare-repository`;
die "$? $!" if $?;
chomp $bare or die;
sub getobj ($$) {
my ($obj, $type) = @_;
print GCFI $obj, "\n" or die $!;
my $x = <GCFO>;
my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
$gtype eq $type or die "$obj $gtype != $type ?";
my $gdata;
(read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
$x = <GCFO>;
$x eq "\n" or die "$obj ($_) $!";
$count{inspected}++;
return $gdata;
}
sub hashobj ($$) {
my ($data,$type) = @_;
my $gwopid = open2 \*GWO, \*GWI,
"git hash-object -w -t $type --stdin"
or die $!;
print GWI $data or die $!;
close GWI or die $!;
$_ = <GWO>;
close GWO or die $!;
waitpid $gwopid,0 == $gwopid or die $!;
die $? if $?;
m/^(\w+)\n/ or die "$_ ?";
$count{"rewritten $type"}++;
return $1;
}
our %memo;
sub rewrite_commit ($);
sub rewrite_commit ($) {
my ($obj) = @_;
my $m = \ $memo{$obj};
return $$m if defined $$m;
my $olddata = getobj $obj, 'commit';
$olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
my $msg = $';
local $_ = $`;
s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
$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'}++;
}
my $newdata = $_.$msg;
my $newobj;
if ($newdata eq $olddata) {
$newobj = $obj;
$count{unchanged}++;
} else {
$newobj = hashobj $newdata, 'commit';
}
$$m= $newobj;
return $newobj;
}
sub rewrite_tag ($) {
my ($obj) = @_;
$_ = getobj $obj, 'tag';
m/^type (\w+)\n/m or die "$obj ?";
if ($1 ne 'commit') {
$count{"oddtags $1"}++;
return $obj;
}
m/^object (\w+)\n/m or die "$obj ?";
my $oldref = $1;
my $newref = rewrite_commit $oldref;
if ($oldref eq $newref) {
return $obj;
}
s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
return hashobj $_, 'tag';
}
$!=0; $?=0;
my $refs=`git for-each-ref`;
die "$? $!" if $?;
chomp $refs;
our @updates;
foreach my $rline (split /\n/, $refs) {
my ($obj, $type, $refname) =
$rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
or die "$_ ?";
my $rewrite;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
} elsif ($type eq 'tag') {
$rewrite = rewrite_tag($obj);
} else {
warn "ref $refname refers to $type\n";
next;
}
next if $rewrite eq $obj;
push @updates, [ $refname, $obj, $rewrite ];
}
our $worktree;
#print Dumper(\@updates);
open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
if ($real && $bare eq 'false') {
print "detaching your HEAD\n" or die $!;
runcmd 'git checkout --detach';
}
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 $!;
}
|
