X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-badcommit-fixup;h=3e4a7182b5422978b2ebe9ff49c78baa21872d21;hp=a9a8f60f88aa94d7e459e968a091f826abcd955d;hb=952a781025083b34762fe6bb2093ef64524c23cd;hpb=e0feac940e7af31c5ddfa3c54b54567ef6632e4f

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index a9a8f60f..3e4a7182 100755
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -19,6 +19,8 @@
 #
 # 4. Run the mirror script to push changes, if necessary.
 
+END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
+use Debian::Dgit::ExitStatus;
 
 use strict;
 
@@ -59,6 +61,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 $!;
@@ -163,6 +176,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;
 
@@ -231,9 +247,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);
@@ -258,7 +285,7 @@ filter_updates();
 
 if (!@updates) {
     print Dumper(\%count), "all is well - nothing to do\n";
-    exit 0;
+    finish 0;
 }
 
 #print Dumper(\@updates);
@@ -298,4 +325,9 @@ if ($real >= 0) {
     print "old values saved in refs/dgit-badcommit/\n" or die $!;
 } 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;