From 52ad9a1528bc51f65411aca263def97615367943 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Nov 2013 23:27:15 -0400 Subject: 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Git/Config.hs') diff --git a/Git/Config.hs b/Git/Config.hs index 1919ecedf..b5c1be04a 100644 --- a/Git/Config.hs +++ b/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 -- cgit v1.2.3