X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-badcommit-fixup;h=3995ceb6e8c3349ad6565dcbd6157d0c9061a8db;hp=d1bca74dc23f245e2d4b88dec1455df1400bbb55;hb=5c1ed9665a1ec02cdaa5811e58600edcda0ce3b2;hpb=ec7cf6aaf2fce8af943ccdd866e98f805f8a98fe

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index d1bca74d..3995ceb6 100755
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -3,6 +3,7 @@
 # Script to help with fallout from #849041.
 #
 # usage:
+#   dgit-badcommit-fixup --check
 #   dgit-badcommit-fixup --test
 #   dgit-badcommit-fixup --real
 
@@ -25,6 +26,8 @@ use POSIX;
 use IPC::Open2;
 use Data::Dumper;
 
+our $our_version = 'UNRELEASED'; ###substituted###
+
 my $real;
 
 foreach my $a (@ARGV) {
@@ -32,6 +35,8 @@ foreach my $a (@ARGV) {
 	$real = 0;
     } elsif ($a eq '--real') {
 	$real = 1;
+    } elsif ($a eq '--check') {
+	$real = -1;
     } else {
 	die "$a ?";
     }
@@ -54,6 +59,17 @@ my $bare = `git rev-parse --is-bare-repository`;
 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 $!;
@@ -158,6 +174,9 @@ sub edit_rewrite_map ($) {
     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;
 
@@ -193,9 +212,11 @@ sub edit_rewrite_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`;
@@ -224,8 +245,20 @@ foreach my $rline (split /\n/, $refs) {
 	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);
@@ -249,40 +282,48 @@ if ($bare eq 'true') {
 filter_updates();
 
 if (!@updates) {
-    print Dumper(\%count), "nothing to do\n";
+    print Dumper(\%count), "all is well - nothing to do\n";
     exit 0;
 }
 
 #print Dumper(\@updates);
 
-open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
+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";
+    exit 2;
 }