return $newobj;
}
-sub rewrite_commit_adddummy ($$$) {
- my ($ref, $veryold, $old) = @_;
+our @updates;
- die "$bare ?" unless $bare eq 'true';
+sub filter_updates () {
+ @updates = grep { $_->[1] ne $_->[2] } @updates;
+}
+
+sub rewrite_tag ($) {
+ my ($obj) = @_;
+ $_ = getobj $obj, 'tag';
+ m/^type (\w+)\n/m or die "$obj ?";
+ if ($1 ne 'commit') {
+ $count{"oddtags $1"}++;
+ return $obj;
+ }
+ m/^object (\w+)\n/m or die "$obj ?";
+ my $oldref = $1;
+ my $newref = rewrite_commit $oldref;
+ if ($oldref eq $newref) {
+ return $obj;
+ }
+ s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
+ s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
+ return hashobj $_, 'tag';
+}
+
+sub rewrite_rewrite_map ($) {
+ my ($old) = @_;
my $td = 'dgit-broken-fixup.tmp';
runcmd qw(rm -rf), $td;
runcmd qw(git config gc.auto 0);
runcmd qw(rm -rf .git/objects);
symlink "../../objects", ".git/objects" or die $!;
- runcmd qw(git checkout -q), $old;
-
- open C, "debian/changelog" or die $!;
- my $clog = do {
- local $/ = undef;
- <C>;
- };
- C->error and die $!;
- close C or die $!;
- defined $clog or die $!;
-
- $!=0; $?=0;
- my $v = `dpkg-parsechangelog`;
- die "$ref $veryold $old $? $!" if $?;
- $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
- my $pkg = $1;
- $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
- my $vsn = $1;
- $vsn .= "+~dgitfix";
- open C, ">", "debian/changelog" or die $!;
- print C <<END;
-$pkg ($vsn) UNRELEASED; urgency=low
+ my %map;
- * Additional commit, with slightly incremented version number,
- to override bad commits generated by dgit due to #849041.
- * No changes to the package.
- * Not uploaded anywhere.
+ if ($old) {
+ runcmd qw(git checkout -q), $old;
+ open M, "map" or die $!;
+ while (<M>) {
+ m/^(\w+)(?:\s+(\w+))?$/ or die;
+ $map{$1} = $2;
+ $count{rewrite_map_previous}++;
+ }
+ M->error and die $!;
+ close M or die $!;
+ }
- -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
+ filter_updates();
+ foreach my $up (@updates) {
+ $map{ $_->[1] } = $_->[2];
+ }
-END
- print C $clog or die $!;
- close C or die $!;
+ open M, ">", "map" or die $!;
+ print M "%s%s\n",
+ $_, (defined $map{$_} ? " $map{$_}" : "")
+ or die $!;
+ foreach keys %map;
+ close M or die $!;
runcmd qw(git commit -q),
- '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
- qw(-m), 'Dummy changelog entry to work around #849041 fallout',
- qw(debian/changelog);
+ qw(-m), 'dgit-badcommit-fixup',
+ qw(map);
$!=0; $?=0;
my $new = `git rev-parse HEAD`;
chdir '..' or die $!;
runcmd qw(rm -rf), $td;
- $count{dummyadded}++;
+ $count{rewrite_map_updated}++;
return $new;
}
-sub rewrite_tag ($) {
- my ($obj) = @_;
- $_ = getobj $obj, 'tag';
- m/^type (\w+)\n/m or die "$obj ?";
- if ($1 ne 'commit') {
- $count{"oddtags $1"}++;
- return $obj;
- }
- m/^object (\w+)\n/m or die "$obj ?";
- my $oldref = $1;
- my $newref = rewrite_commit $oldref;
- if ($oldref eq $newref) {
- return $obj;
- }
- s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
- s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
- return hashobj $_, 'tag';
-}
-
$!=0; $?=0;
my $refs=`git for-each-ref`;
die "$? $!" if $?;
chomp $refs;
-our @updates;
+our $org_rewrite_map;
foreach my $rline (split /\n/, $refs) {
my ($obj, $type, $refname) =
$rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
or die "$_ ?";
+ if ($refname eq 'refs/dgit-rewrite/map') {
+ $org_rewrite_map = $obj;
+ continue;
+ }
my $rewrite;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
- if ($refname =~ m{^refs/dgit/[^/]+$} &&
- $rewrite ne $obj) {
- $rewrite = rewrite_commit_adddummy $refname, $obj, $rewrite;
- }
} elsif ($type eq 'tag') {
$rewrite = rewrite_tag($obj);
} else {
warn "ref $refname refers to $type\n";
next;
}
- next if $rewrite eq $obj;
push @updates, [ $refname, $obj, $rewrite ];
}
-our $worktree;
+if ($bare eq 'true') {
+ my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
+ push @updates, [ 'refs/dgit-rewrite/map',
+ ($org_rewrite_map // '0'x40),
+ $new_rewrite_map ];
+}
+
+filter_updates();
#print Dumper(\@updates);