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 $!";
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 runcmd qw(rm -rf .git/objects);
117 symlink "../../objects", ".git/objects" or die $!;
118 runcmd qw(git checkout -q), $old;
120 open C, "debian/changelog" or die $!;
127 defined $clog or die $!;
130 my $v = `dpkg-parsechangelog`;
131 die "$ref $veryold $old $? $!" if $?;
132 $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
134 $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
138 open C, ">", "debian/changelog" or die $!;
140 $pkg ($vsn) UNRELEASED; urgency=low
142 * Additional commit, with slightly incremented version number,
143 to override bad commits generated by dgit due to #849041.
144 * No changes to the package.
145 * Not uploaded anywhere.
147 -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
150 print C $clog or die $!;
153 runcmd qw(git commit -q),
154 '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
155 qw(-m), 'Dummy changelog entry to work around #849041 fallout',
156 qw(debian/changelog);
159 my $new = `git rev-parse HEAD`;
163 chdir '..' or die $!;
164 runcmd qw(rm -rf), $td;
166 $count{dummyadded}++;
171 sub rewrite_tag ($) {
173 $_ = getobj $obj, 'tag';
174 m/^type (\w+)\n/m or die "$obj ?";
175 if ($1 ne 'commit') {
176 $count{"oddtags $1"}++;
179 m/^object (\w+)\n/m or die "$obj ?";
181 my $newref = rewrite_commit $oldref;
182 if ($oldref eq $newref) {
185 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
186 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
187 return hashobj $_, 'tag';
191 my $refs=`git for-each-ref`;
198 foreach my $rline (split /\n/, $refs) {
199 my ($obj, $type, $refname) =
200 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
203 if ($type eq 'commit') {
204 $rewrite = rewrite_commit($obj);
205 if ($refname =~ m{^refs/dgit/[^/]+$} &&
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 $!;