# Script to help with fallout from #849041.
#
# usage:
+# dgit-badcommit-fixup --check
# dgit-badcommit-fixup --test
# dgit-badcommit-fixup --real
+# Update procedure, from server operator's point of view:
+#
+# 1. Test in an offline tree that this DTRT
+#
+# 2. Announce a transition time. Tell everyone that between
+# the transition time and their next upload, they must
+# run this script.
+#
+# 3. At the transition time, run this script in every repo.
+#
+# 4. Run the mirror script to push changes, if necessary.
+
+END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
+use Debian::Dgit::ExitStatus;
+
use strict;
use POSIX;
use IPC::Open2;
use Data::Dumper;
+our $our_version = 'UNRELEASED'; ###substituted###
+
my $real;
foreach my $a (@ARGV) {
$real = 0;
} elsif ($a eq '--real') {
$real = 1;
+ } elsif ($a eq '--check') {
+ $real = -1;
} else {
die "$a ?";
}
die "$? $!" if $?;
chomp $bare or die;
+our @configs;
+foreach my $k (qw(core.sharedRepository)) {
+ $?=0; $!=0; my $v = `set -x; git config --local $k`;
+ if (defined $v && $?==0 && chomp $v) {
+ push @configs, [ $k, $v ];
+ } elsif (defined $v && $?==256 && $v eq '') {
+ } else {
+ die "git-config --local $k => $v $? $! ?";
+ }
+}
+
sub getobj ($$) {
my ($obj, $type) = @_;
print GCFI $obj, "\n" or die $!;
runcmd qw(git config gc.auto 0);
runcmd qw(rm -rf .git/objects);
symlink "../../objects", ".git/objects" or die $!;
+ foreach my $c (@configs) {
+ runcmd qw(git config), $c->[0], $c->[1];
+ }
my %map;
runcmd qw(git add map);
}
- runcmd qw(git commit -q),
- qw(-m), 'dgit-badcommit-fixup',
- qw(map);
+ runcmd qw(git commit -q), qw(-m), <<END, qw(map);
+dgit-badcommit-fixup
+
+[dgit-badcommit-fixup $our_version]
+END
$!=0; $?=0;
my $new = `git rev-parse HEAD`;
or die "$_ ?";
if ($refname eq 'refs/dgit-rewrite/map') {
$org_rewrite_map = $obj;
- continue;
+ next;
}
+ next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
+
+ $!=0; $?=0;
+ system qw(sh -ec),
+ 'exec >/dev/null git symbolic-ref -q "$1"', qw(x),
+ $refname;
+ if ($?==0) {
+ $count{symrefs_ignored}++;
+ next;
+ }
+ die "$? $!" unless $?==256;
+
my $rewrite;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
filter_updates();
if (!@updates) {
- print Dumper(\%count), "nothing to do\n";
- exit 0;
+ print Dumper(\%count), "all is well - nothing to do\n";
+ finish 0;
}
#print Dumper(\@updates);
-open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
-
-if ($real && $bare eq 'false') {
- print "detaching your HEAD\n" or die $!;
- runcmd 'git checkout --detach';
-}
+open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!
+ if $real >= 0;
for my $up (@updates) {
my ($ref, $old, $new, $nobackup) = @$up;
my $otherref = $ref;
$otherref =~ s{^refs/}{};
- if ($real) {
+ if ($real > 0) {
print U <<END or die $! unless $nobackup;
create refs/dgit-badcommit/$otherref $old
END
print U <<END or die $!;
update $ref $new $old
END
- } else {
+ } elsif ($real==0) {
print U <<END or die $!;
update refs/dgit-badfixuptest/$otherref $new
END
+ } else {
+ print "found trouble in history of $ref\n" or die $!;
}
}
-$?=0; $!=0;
-close U or die "$? $!";
-die $? if $?;
+if ($real >= 0) {
+ $?=0; $!=0;
+ close U or die "$? $!";
+ die $? if $?;
+}
print Dumper(\%count);
-if ($real) {
+if ($real >= 0) {
print "old values saved in refs/dgit-badcommit/\n" or die $!;
-} else {
+} elsif ($real == 0) {
print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;
+} else {
+ print STDERR "found work to do, exiting status 2\n";
+ finish 2;
}
+
+finish 0;