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=935f5dff982ba6bddd21abbc5255691103a97238;hb=c386ae2688431a622f9d41b3668755420fcbed39;hpb=7a3361bb3c0dab34d001bcda1c56ec42aec6e8b3

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index 935f5dff..3995ceb6 100755
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -59,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 $!;
@@ -163,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;
 
@@ -234,6 +248,17 @@ foreach my $rline (split /\n/, $refs) {
 	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);
@@ -298,4 +323,7 @@ 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";
+    exit 2;
 }