3 # Script to help with fallout from #849041.
6 # dgit-badcommit-fixup --test
7 # dgit-badcommit-fixup --real
17 foreach my $a (@ARGV) {
20 } elsif ($a eq '--real') {
27 die unless defined $real;
29 my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
33 no warnings qw(recursion);
36 system @_ and die "@_ $! $?";
40 my $bare = `git rev-parse --is-bare-repository`;
45 my ($obj, $type) = @_;
46 print GCFI $obj, "\n" or die $!;
48 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
49 $gtype eq $type or die "$obj $gtype != $type ?";
51 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
53 $x eq "\n" or die "$obj ($_) $!";
59 my ($data,$type) = @_;
60 my $gwopid = open2 \*GWO, \*GWI,
61 "git hash-object -w -t $type --stdin"
63 print GWI $data or die $!;
67 waitpid $gwopid,0 == $gwopid or die $!;
69 m/^(\w+)\n/ or die "$_ ?";
70 $count{"rewritten $type"}++;
76 sub rewrite_commit ($);
77 sub rewrite_commit ($) {
79 my $m = \ $memo{$obj};
80 return $$m if defined $$m;
81 my $olddata = getobj $obj, 'commit';
82 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
85 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
86 $count{'fix overwrite'} += s{^commiter }{committer }gm;
87 if (!m{^author }m && !m{^committer }m) {
88 m{^parent (\w+)}m or die "$obj ?";
89 my $parent = getobj $1, 'commit';
90 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
91 m/\n$/ or die "$obj ?";
93 $count{'fix import'}++;
95 my $newdata = $_.$msg;
97 if ($newdata eq $olddata) {
101 $newobj = hashobj $newdata, 'commit';
107 sub rewrite_commit_adddummy ($$$) {
108 my ($ref, $veryold, $old) = @_;
110 die "$bare ?" unless $bare eq 'true';
112 my $td = 'dgit-broken-fixup.tmp';
113 runcmd qw(rm -rf), $td;
114 mkdir $td, 0700 or die "$td $!";
116 runcmd qw(git init -q);
117 runcmd qw(git config gc.auto 0);
118 runcmd qw(rm -rf .git/objects);
119 symlink "../../objects", ".git/objects" or die $!;
120 runcmd qw(git checkout -q), $old;
122 open C, "debian/changelog" or die $!;
129 defined $clog or die $!;
132 my $v = `dpkg-parsechangelog`;
133 die "$ref $veryold $old $? $!" if $?;
134 $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
136 $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
140 open C, ">", "debian/changelog" or die $!;
142 $pkg ($vsn) UNRELEASED; urgency=low
144 * Additional commit, with slightly incremented version number,
145 to override bad commits generated by dgit due to #849041.
146 * No changes to the package.
147 * Not uploaded anywhere.
149 -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
152 print C $clog or die $!;
155 runcmd qw(git commit -q),
156 '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
157 qw(-m), 'Dummy changelog entry to work around #849041 fallout',
158 qw(debian/changelog);
161 my $new = `git rev-parse HEAD`;
165 chdir '..' or die $!;
166 runcmd qw(rm -rf), $td;
168 $count{dummyadded}++;
173 sub rewrite_tag ($) {
175 $_ = getobj $obj, 'tag';
176 m/^type (\w+)\n/m or die "$obj ?";
177 if ($1 ne 'commit') {
178 $count{"oddtags $1"}++;
181 m/^object (\w+)\n/m or die "$obj ?";
183 my $newref = rewrite_commit $oldref;
184 if ($oldref eq $newref) {
187 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
188 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
189 return hashobj $_, 'tag';
193 my $refs=`git for-each-ref`;
200 foreach my $rline (split /\n/, $refs) {
201 my ($obj, $type, $refname) =
202 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
205 if ($type eq 'commit') {
206 $rewrite = rewrite_commit($obj);
207 if ($refname =~ m{^refs/dgit/[^/]+$} &&
209 $rewrite = rewrite_commit_adddummy $refname, $obj, $rewrite;
211 } elsif ($type eq 'tag') {
212 $rewrite = rewrite_tag($obj);
214 warn "ref $refname refers to $type\n";
217 next if $rewrite eq $obj;
218 push @updates, [ $refname, $obj, $rewrite ];
223 #print Dumper(\@updates);
225 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
227 if ($real && $bare eq 'false') {
228 print "detaching your HEAD\n" or die $!;
229 runcmd 'git checkout --detach';
232 for my $up (@updates) {
233 my ($ref, $old, $new) = @$up;
235 $otherref =~ s{^refs/}{};
237 print U <<END or die $!;
238 create refs/dgit-badcommit/$otherref $old
239 update $ref $new $old
242 print U <<END or die $!;
243 update refs/dgit-badfixuptest/$otherref $new
249 close U or die "$? $!";
252 print Dumper(\%count);
255 print "old values saved in refs/dgit-badcommit/\n" or die $!;
257 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;