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 system @_ and die "$! $?";
38 my $bare = `git rev-parse --is-bare-repository`;
42 my ($obj, $type) = @_;
43 print GCFI $obj, "\n" or die $!;
45 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
46 $gtype eq $type or die "$obj $gtype != $type ?";
48 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
49 #print STDERR ">$obj|$x|$gdata|$gsize<\n";
51 $x eq "\n" or die "$obj ($_) $!";
57 my ($data,$type) = @_;
58 my $gwopid = open2 \*GWO, \*GWI,
59 "git hash-object -w -t $type --stdin"
61 print GWI $data or die $!;
65 waitpid $gwopid,0 == $gwopid or die $!;
67 m/^(\w+)\n/ or die "$_ ?";
68 $count{"rewritten $type"}++;
74 sub rewrite_commit ($);
75 sub rewrite_commit ($) {
77 my $m = \ $memo{$obj};
78 return $$m if defined $$m;
79 my $olddata = getobj $obj, 'commit';
80 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
83 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
84 $count{'fix overwrite'} += s{^commiter }{committer }gm;
85 if (!m{^author }m && !m{^committer }m) {
86 m{^parent (\w+)}m or die "$obj ?";
87 my $parent = getobj $1, 'commit';
88 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
89 m/\n$/ or die "$obj ?";
91 $count{'fix import'}++;
93 my $newdata = $_.$msg;
95 if ($newdata eq $olddata) {
99 $newobj = hashobj $newdata, 'commit';
105 sub rewrite_commit_adddummy ($$$) {
106 my ($ref, $veryold, $old) = @_;
108 die "$bare ?" unless $bare eq 'true';
110 my $td = 'dgit-broken-fixup.tmp';
111 runcmd qw(rm -rf), $td;
112 mkdir $td, 0700 or die "$td $!";
114 runcmd qw(git init -q);
115 runcmd qw(git config gc.auto 0);
116 rmdir ".git/objects";
117 symlink "../objects", ".git/objects" or die $!;
118 runcmd qw(git checkout -q), $old;
120 open C, "debian/changelog" or die $!;
125 defined $clog or die $!;
128 my $v = `dpkg-parsechangelog`;
129 die "$ref $veryold $old $? $!" if $?;
130 $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
132 $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
136 open C, ">", "debian/changelog" or die $!;
138 $pkg ($vsn) UNRELEASED; urgency=low
140 * Additional commit, with slightly incremented version number,
141 to override bad commits generated by dgit due to #849041.
142 * No changes to the package.
143 * Not uploaded anywhere.
145 -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
148 print C $clog or die $!;
151 runcmd qw(git commit -q),
152 '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
153 qw(-m), 'Dummy changelog entry to work around #849041 fallout',
154 qw(debian/changelog);
157 my $new = `git rev-parse HEAD`;
160 chdir '..' or die $!;
161 runcmd qw(rm -rf), $td;
163 $count{dummyadded}++;
168 sub rewrite_tag ($) {
170 $_ = getobj $obj, 'tag';
171 m/^type (\w+)\n/m or die "$obj ?";
172 if ($1 ne 'commit') {
173 $count{"oddtags $1"}++;
176 m/^object (\w+)\n/m or die "$obj ?";
178 my $newref = rewrite_commit $oldref;
179 if ($oldref eq $newref) {
182 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
183 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
184 return hashobj $_, 'tag';
188 my $refs=`git for-each-ref`;
195 foreach my $rline (split /\n/, $refs) {
196 my ($obj, $type, $refname) =
197 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
200 if ($type eq 'commit') {
201 $rewrite = rewrite_commit($obj);
202 if ($refname =~ m{^refs/dgit/^[/]+$}) {
203 $rewrite = rewrite_commit_adddummy $refname, $obj, $rewrite;
205 } elsif ($type eq 'tag') {
206 $rewrite = rewrite_tag($obj);
208 warn "ref $refname refers to $type\n";
211 next if $rewrite eq $obj;
212 push @updates, [ $refname, $obj, $rewrite ];
217 print Dumper(\@updates);
219 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
221 if ($real && $bare eq 'false') {
222 print "detaching your HEAD\n" or die $!;
223 runcmd 'git checkout --detach';
226 for my $up (@updates) {
227 my ($ref, $old, $new) = @$up;
229 $otherref =~ s{^refs/}{};
231 print U <<END or die $!;
232 create refs/dgit-badcommit/$otherref $old
233 update $ref $new $old
236 print U <<END or die $!;
237 update refs/dgit-badfixuptest/$otherref $new
243 close U or die "$? $!";
246 print Dumper(\%count);
249 print "old values saved in refs/dgit-badcommit/\n" or die $!;
251 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;