From 15efa428cc98a11fae7bdf1a7cbb449b82bb3359 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 5 Jan 2017 19:10:37 +0000
Subject: [PATCH] badcommit-fixup: break out $bare

---
 badcommit-fixup | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/badcommit-fixup b/badcommit-fixup
index 42dd67b0..732974c1 100755
--- a/badcommit-fixup
+++ b/badcommit-fixup
@@ -31,12 +31,13 @@ our %count;
 no warnings qw(recursion);
 
 sub runcmd {
-    system @_ and die "$! $?";
+    system @_ and die "@_ $! $?";
 }
 
 $!=0; $?=0;
 my $bare = `git rev-parse --is-bare-repository`;
 die "$? $!" if $?;
+chomp $bare or die;
 
 sub getobj ($$) {
     my ($obj, $type) = @_;
@@ -79,7 +80,7 @@ sub rewrite_commit ($) {
     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) {
@@ -113,8 +114,8 @@ sub rewrite_commit_adddummy ($$$) {
     chdir $td or die $!;
     runcmd qw(git init -q);
     runcmd qw(git config gc.auto 0);
-    rmdir ".git/objects";
-    symlink "../objects", ".git/objects" or die $!;
+    runcmd qw(rm -rf .git/objects);
+    symlink "../../objects", ".git/objects" or die $!;
     runcmd qw(git checkout -q), $old;
 
     open C, "debian/changelog" or die $!;
@@ -199,7 +200,10 @@ foreach my $rline (split /\n/, $refs) {
     my $rewrite;
     if ($type eq 'commit') {
 	$rewrite = rewrite_commit($obj);
-	if ($refname =~ m{^refs/dgit/^[/]+$}) {
+print STDERR "RW? $refname $obj $rewrite\n";
+	if ($refname =~ m{^refs/dgit/[^/]+$} &&
+	   $rewrite ne $obj) {
+print STDERR "RW  $refname\n";
 	    $rewrite = rewrite_commit_adddummy $refname, $obj, $rewrite;
 	}
     } elsif ($type eq 'tag') {
-- 
2.30.2