Fix bug that broke switching between local repositories in the webapp when they use the new guarded direct mode.

git treats eg ~/annex as a bare git repository located in ~/.annex/.git
if ~/annex/.git/config has core.bare=true.

Git/Config.hs

@@ -110,8 +110,13 @@ store s repo = do
  -}
 updateLocation :: Repo -> IO Repo
 updateLocation r@(Repo { location = LocalUnknown d })
-	| isBare r = updateLocation' r $ Local d Nothing
-	| otherwise = updateLocation' r $ Local (d </> ".git") (Just d)
+	| isBare r = ifM (doesDirectoryExist dotgit)
+			( updateLocation' r $ Local dotgit Nothing
+			, updateLocation' r $ Local d Nothing
+			)
+	| otherwise = updateLocation' r $ Local dotgit (Just d)
+  where
+	dotgit = (d </> ".git")
 updateLocation r@(Repo { location = l@(Local {}) }) = updateLocation' r l
 updateLocation r = return r
 

debian/changelog

@@ -9,6 +9,8 @@ git-annex (5.20131121) UNRELEASED; urgency=low
     and either prompt the user to restart the program, or automatically
     restart it.
   * annex.autoupgrade configures both the above upgrade behaviors.
+  * Fix bug that broke switching between local repositories
+    in the webapp when they use the new guarded direct mode.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 20 Nov 2013 18:30:47 -0400