Always ensure git-annex branch exists.

2 files changed, 10 insertions, 3 deletions

diff --git a/Branch.hs b/Branch.hs
index 3f5e0ee1e..916261a9c 100644
--- a/Branch.hs
+++ b/Branch.hs
@@ -83,9 +83,10 @@ withIndex' bootstrapping a = do
 	reset <- liftIO $ Git.useIndex f
 
 	e <- liftIO $ doesFileExist f
-	unless e $ liftIO $ do
-		createDirectoryIfMissing True $ takeDirectory f
-		unless bootstrapping $ genIndex g
+	unless e $ do
+		unless bootstrapping $ create
+		liftIO $ createDirectoryIfMissing True $ takeDirectory f
+		liftIO $ unless bootstrapping $ genIndex g
 
 	r <- a
 	liftIO reset
diff --git a/debian/changelog b/debian/changelog
index 47652241a..854314856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (3.20110625) UNRELEASED; urgency=low
+
+  * Always ensure git-annex branch exists.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 26 Jun 2011 21:01:06 -0400
+
 git-annex (3.20110624) experimental; urgency=low
 
   * New repository format, annex.version=3. Use `git annex upgrade` to migrate.