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`;
43 my ($obj, $type) = @_;
44 print GCFI $obj, "\n" or die $!;
46 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
47 $gtype eq $type or die "$obj $gtype != $type ?";
49 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
50 #print STDERR ">$obj|$x|$gdata|$gsize<\n";
52 $x eq "\n" or die "$obj ($_) $!";
58 my ($data,$type) = @_;
59 my $gwopid = open2 \*GWO, \*GWI,
60 "git hash-object -w -t $type --stdin"
62 print GWI $data or die $!;
66 waitpid $gwopid,0 == $gwopid or die $!;
68 m/^(\w+)\n/ or die "$_ ?";
69 $count{"rewritten $type"}++;
75 sub rewrite_commit ($);
76 sub rewrite_commit ($) {
78 my $m = \ $memo{$obj};
79 return $$m if defined $$m;
80 my $olddata = getobj $obj, 'commit';
81 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
84 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
85 $count{'fix overwrite'} += s{^commiter }{committer }gm;
86 if (!m{^author }m && !m{^committer }m) {
87 m{^parent (\w+)}m or die "$obj ?";
88 my $parent = getobj $1, 'commit';
89 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
90 m/\n$/ or die "$obj ?";
92 $count{'fix import'}++;
94 my $newdata = $_.$msg;
96 if ($newdata eq $olddata) {
100 $newobj = hashobj $newdata, 'commit';
106 sub rewrite_commit_adddummy ($$$) {
107 my ($ref, $veryold, $old) = @_;
109 die "$bare ?" unless $bare eq 'true';
111 my $td = 'dgit-broken-fixup.tmp';
112 runcmd qw(rm -rf), $td;
113 mkdir $td, 0700 or die "$td $!";
115 runcmd qw(git init -q);
116 runcmd qw(git config gc.auto 0);
117 runcmd qw(rm -rf .git/objects);
118 symlink "../../objects", ".git/objects" or die $!;
119 runcmd qw(git checkout -q), $old;
121 open C, "debian/changelog" or die $!;
126 defined $clog or die $!;
129 my $v = `dpkg-parsechangelog`;
130 die "$ref $veryold $old $? $!" if $?;
131 $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
133 $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
137 open C, ">", "debian/changelog" or die $!;
139 $pkg ($vsn) UNRELEASED; urgency=low
141 * Additional commit, with slightly incremented version number,
142 to override bad commits generated by dgit due to #849041.
143 * No changes to the package.
144 * Not uploaded anywhere.
146 -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
149 print C $clog or die $!;
152 runcmd qw(git commit -q),
153 '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
154 qw(-m), 'Dummy changelog entry to work around #849041 fallout',
155 qw(debian/changelog);
158 my $new = `git rev-parse HEAD`;
161 chdir '..' or die $!;
162 runcmd qw(rm -rf), $td;
164 $count{dummyadded}++;
169 sub rewrite_tag ($) {
171 $_ = getobj $obj, 'tag';
172 m/^type (\w+)\n/m or die "$obj ?";
173 if ($1 ne 'commit') {
174 $count{"oddtags $1"}++;
177 m/^object (\w+)\n/m or die "$obj ?";
179 my $newref = rewrite_commit $oldref;
180 if ($oldref eq $newref) {
183 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
184 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
185 return hashobj $_, 'tag';
189 my $refs=`git for-each-ref`;
196 foreach my $rline (split /\n/, $refs) {
197 my ($obj, $type, $refname) =
198 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
201 if ($type eq 'commit') {
202 $rewrite = rewrite_commit($obj);
203 print STDERR "RW? $refname $obj $rewrite\n";
204 if ($refname =~ m{^refs/dgit/[^/]+$} &&
206 print STDERR "RW $refname\n";
207 $rewrite = rewrite_commit_adddummy $refname, $obj, $rewrite;
209 } elsif ($type eq 'tag') {
210 $rewrite = rewrite_tag($obj);
212 warn "ref $refname refers to $type\n";
215 next if $rewrite eq $obj;
216 push @updates, [ $refname, $obj, $rewrite ];
221 print Dumper(\@updates);
223 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
225 if ($real && $bare eq 'false') {
226 print "detaching your HEAD\n" or die $!;
227 runcmd 'git checkout --detach';
230 for my $up (@updates) {
231 my ($ref, $old, $new) = @$up;
233 $otherref =~ s{^refs/}{};
235 print U <<END or die $!;
236 create refs/dgit-badcommit/$otherref $old
237 update $ref $new $old
240 print U <<END or die $!;
241 update refs/dgit-badfixuptest/$otherref $new
247 close U or die "$? $!";
250 print Dumper(\%count);
253 print "old values saved in refs/dgit-badcommit/\n" or die $!;
255 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;