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 my ($obj, $type) = @_;
35 print GCFI $obj, "\n" or die $!;
37 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
38 $gtype eq $type or die "$obj $gtype != $type ?";
40 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
41 #print STDERR ">$obj|$x|$gdata|$gsize<\n";
43 $x eq "\n" or die "$obj ($_) $!";
49 my ($data,$type) = @_;
50 my $gwopid = open2 \*GWO, \*GWI,
51 "git hash-object -w -t $type --stdin"
53 print GWI $data or die $!;
57 waitpid $gwopid,0 == $gwopid or die $!;
59 m/^(\w+)\n/ or die "$_ ?";
60 $count{"rewritten $type"}++;
66 sub rewrite_commit ($);
67 sub rewrite_commit ($) {
69 my $m = \ $memo{$obj};
70 return $$m if defined $$m;
71 my $olddata = getobj $obj, 'commit';
72 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
75 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
76 $count{'fix overwrite'} += s{^commiter }{committer }gm;
77 if (!m{^author }m && !m{^committer }m) {
78 m{^parent (\w+)}m or die "$obj ?";
79 my $parent = getobj $1, 'commit';
80 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
81 m/\n$/ or die "$obj ?";
83 $count{'fix import'}++;
85 my $newdata = $_.$msg;
87 if ($newdata eq $olddata) {
91 $newobj = hashobj $newdata, 'commit';
99 $_ = getobj $obj, 'tag';
100 m/^type (\w+)\n/m or die "$obj ?";
101 if ($1 ne 'commit') {
102 $count{"oddtags $1"}++;
105 m/^object (\w+)\n/m or die "$obj ?";
107 my $newref = rewrite_commit $oldref;
108 if ($oldref eq $newref) {
111 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
112 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
113 return hashobj $_, 'tag';
117 my $refs=`git for-each-ref`;
124 foreach my $rline (split /\n/, $refs) {
125 my ($obj, $type, $refname) =
126 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
129 if ($type eq 'commit') {
130 $rewrite = rewrite_commit($obj);
131 } elsif ($type eq 'tag') {
132 $rewrite = rewrite_tag($obj);
134 warn "ref $refname refers to $type\n";
137 next if $rewrite eq $obj;
138 push @updates, [ $refname, $obj, $rewrite ];
142 my $bare = `git rev-parse --is-bare-repository`;
148 system @_ and die "$! $?";
151 for my $up (@updates) {
152 my ($ref, $veryold, $old) = @$up;
153 next unless $ref =~ m{^refs/dgit/^[/]+$};
155 die "$bare ?" unless $bare eq 'true';
157 my $td = 'dgit-broken-fixup.tmp';
158 runcmd qw(rm -rf), $td;
159 mkdir $td, 0700 or die "$td $!";
161 runcmd qw(git init -q);
162 runcmd qw(git config gc.auto 0);
163 rmdir ".git/objects";
164 symlink "../objects", ".git/objects" or die $!;
165 runcmd qw(git checkout -q), $old;
167 open C, "debian/changelog" or die $!;
172 defined $clog or die $!;
175 my $v = `dpkg-parsechangelog`;
176 die "$ref $veryold $old $? $!" if $?;
177 $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
179 $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
183 open C, ">", "debian/changelog" or die $!;
185 $pkg ($vsn) UNRELEASED; urgency=low
187 * Additional commit, with slightly incremented version number,
188 to override bad commits generated by dgit due to #849041.
189 * No changes to the package.
190 * Not uploaded anywhere.
192 -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
195 print C $clog or die $!;
198 runcmd qw(git commit -q),
199 '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
200 qw(-m), 'Dummy changelog entry to work around #849041 fallout',
201 qw(debian/changelog);
204 my $new = `git rev-parse HEAD`;
207 chdir '..' or die $!;
208 runcmd qw(rm -rf), $td;
210 $count{dummyadded}++;
215 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
218 if ($bare eq 'false') {
219 print "detaching your HEAD\n" or die $!;
220 runcmd 'git checkout --detach';
224 for my $up (@updates) {
225 my ($ref, $old, $new) = @$up;
227 $otherref =~ s{^refs/}{};
229 print U <<END or die $!;
230 create refs/dgit-badcommit/$otherref $old
231 update $ref $new $old
234 print U <<END or die $!;
235 update refs/dgit-badfixuptest/$otherref $new
241 close U or die "$? $!";
244 print Dumper(\%count);
247 print "old values saved in refs/dgit-badcommit/\n" or die $!;
249 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;