X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=badcommit-fixup;h=b8cb88adbaaf9e257dfd94152f1b4176de94d3e6;hb=20516346c4c61b2bda16d1d27fa65aecebf9fad7;hp=1fa95d5fc31009f9a2ffd22e155d3e282abe43f9;hpb=8f582887972c735d03df34174feac4233d0ffb1d;p=dgit-junk.git

diff --git a/badcommit-fixup b/badcommit-fixup
index 1fa95d5..b8cb88a 100755
--- a/badcommit-fixup
+++ b/badcommit-fixup
@@ -132,8 +132,13 @@ foreach my $rline (split /\n/, $refs) {
 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
 
 if ($real) {
-    print "detaching your HEAD\n" or die $!;
-    system 'git checkout --detach' and die "$! $?";
+    $!=0; $?=0;
+    my $bare = `git rev-parse --is-bare-repository`;
+    die "$? $!" if $?;
+    if ($bare eq 'false') {
+	print "detaching your HEAD\n" or die $!;
+	system 'git checkout --detach' and die "$! $?";
+    }
 }
 
 for my $up (@updates) {