use IPC::Open2;
use Data::Dumper;
-die unless "@ARGV" eq "--test" or "@ARGV" eq "--real";
+my $real;
-my ($modeopt) = @ARGV;
-my $real = ($modeopt eq '--real');
+foreach my $a (@ARGV) {
+ if ($a eq '--test') {
+ $real = 0;
+ } elsif ($a eq '--real') {
+ $real = 1;
+ } else {
+ die "$a ?";
+ }
+}
+
+die unless defined $real;
my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
no warnings qw(recursion);
+sub runcmd {
+ system @_ and die "@_ $! $?";
+}
+
+$!=0; $?=0;
+my $bare = `git rev-parse --is-bare-repository`;
+die "$? $!" if $?;
+chomp $bare or die;
+
sub getobj ($$) {
my ($obj, $type) = @_;
print GCFI $obj, "\n" or die $!;
$gtype eq $type or die "$obj $gtype != $type ?";
my $gdata;
(read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
-#print STDERR ">$obj|$x|$gdata|$gsize<\n";
$x = <GCFO>;
$x eq "\n" or die "$obj ($_) $!";
$count{inspected}++;
my $olddata = getobj $obj, 'commit';
$olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
my $msg = $';
- $_ = $`;
+ local $_ = $`;
s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
$count{'fix overwrite'} += s{^commiter }{committer }gm;
if (!m{^author }m && !m{^committer }m) {
return $newobj;
}
+sub rewrite_commit_adddummy ($$$) {
+ my ($ref, $veryold, $old) = @_;
+
+ die "$bare ?" unless $bare eq 'true';
+
+ my $td = 'dgit-broken-fixup.tmp';
+ runcmd qw(rm -rf), $td;
+ mkdir $td, 0700 or die "$td $!";
+ chdir $td or die $!;
+ runcmd qw(git init -q);
+ 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
+
+ * 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.
+
+ -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
+
+END
+ print C $clog or die $!;
+ close C 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);
+
+ $!=0; $?=0;
+ my $new = `git rev-parse HEAD`;
+ die "$? $!" if $?;
+ chomp $new or die;
+
+ chdir '..' or die $!;
+ runcmd qw(rm -rf), $td;
+
+ $count{dummyadded}++;
+
+ return $new;
+}
+
sub rewrite_tag ($) {
my ($obj) = @_;
$_ = getobj $obj, 'tag';
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 {
push @updates, [ $refname, $obj, $rewrite ];
}
+our $worktree;
+
+#print Dumper(\@updates);
+
open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
-if ($real) {
+if ($real && $bare eq 'false') {
print "detaching your HEAD\n" or die $!;
- system 'git checkout --detach' and die "$! $?";
+ runcmd 'git checkout --detach';
}
for my $up (@updates) {