wip

Annex/Content.hs

@@ -124,7 +124,16 @@ inAnnexSafe key = inAnnex' (fromMaybe False) (Just False) go key
 			Nothing -> is_unlocked
 	check def Nothing = return def
 #else
-	checkindirect _ = return is_missing
+	checkindirect f = ifM (liftIO $ doesFileExist f)
+		( do
+			v <- lockShared f
+			case v of
+				Nothing -> return is_locked
+				Just lockhandle -> do
+					dropLock lockhandle
+					return is_unlocked
+		, return is_missing
+		)
 	{- In Windows, see if we can take a shared lock. If so, 
 	 - remove the lock file to clean up after ourselves. -}
 	checkdirect contentfile lockfile =

debian/changelog

@@ -11,6 +11,7 @@ git-annex (5.20140530) UNRELEASED; urgency=medium
   * webapp: Include ssh port in mangled hostname.
   * Windows: Fix bug introduced in last release that caused files
     in the git-annex branch to have lines teminated with \r.
+  * Windows: Fix retrieving of files from local bare git repositories.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 29 May 2014 20:10:59 -0400
 

doc/bugs/fails_to_get_content_from_bare_repo_on_windows.mdwn

@@ -139,3 +139,5 @@ I have a annex repo in external drive (a bare repo), usually synced with a macbo
     upgrade supported from repository versions: 2 3 4
                                                                   
 [[!tag confirmed]]
+
+> [[fixed|done]] --[[Joey]]