init: Fix a bug that caused git annex init, when run in a bare repository, to set core.bare=false.

2 files changed, 11 insertions, 1 deletions

diff --git a/Init.hs b/Init.hs
index ad1803995..76f8d236e 100644
--- a/Init.hs
+++ b/Init.hs
@@ -65,7 +65,10 @@ initialize mdescription = do
 			setVersion directModeVersion
 		, do
 			setVersion defaultVersion
-			setDirect False
+			-- Handle case where this repo was cloned from a
+			-- direct mode repo.
+			unlessM isBare
+				switchHEADBack
 		)
 	createInodeSentinalFile
 	u <- getUUID
diff --git a/debian/changelog b/debian/changelog
index cd74133ed..02c5318ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (5.20131127.2) UNRELEASED; urgency=low
+
+  * init: Fix a bug that caused git annex init, when run in a bare
+    repository, to set core.bare=false.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 30 Nov 2013 16:10:48 -0400
+
 git-annex (5.20131127.1) unstable; urgency=low
 
   * Rebuild that does not try to use quvi 0.9 from experimental.