From e892768b0e63a9b64ecd6edbdb1021227b082973 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 15 Feb 2016 16:12:18 -0400
Subject: Windows: Fix v6 unlocked files to actually work.

Pointer files were not being treated as annex content, so "git annex get"
didn't replace them with the object.
---
 Annex/Link.hs      | 17 +++++++++++++++++
 Annex/Locations.hs | 10 ----------
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'Annex')

diff --git a/Annex/Link.hs b/Annex/Link.hs
index 7fd0098ef..4a3311af9 100644
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
@@ -12,6 +12,8 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
+{-# LANGUAGE CPP #-}
+
 module Annex.Link where
 
 import Annex.Common
@@ -155,3 +157,18 @@ formatPointer k =
 isPointerFile :: FilePath -> IO (Maybe Key)
 isPointerFile f = catchDefaultIO Nothing $ 
 	parseLinkOrPointer <$> L.readFile f
+
+{- Checks a symlink target or pointer file first line to see if it
+ - appears to point to annexed content.
+ -
+ - We only look for paths inside the .git directory, and not at the .git
+ - directory itself, because GIT_DIR may cause a directory name other
+ - than .git to be used.
+ -}
+isLinkToAnnex :: FilePath -> Bool
+isLinkToAnnex s = (pathSeparator:objectDir) `isInfixOf` s
+#ifdef mingw32_HOST_OS
+	-- '/' is still used inside pointer files on Windows, not the native
+	-- '\'
+	|| ('/':objectDir) `isInfixOf` s
+#endif
diff --git a/Annex/Locations.hs b/Annex/Locations.hs
index 322165aee..4c2816fa9 100644
--- a/Annex/Locations.hs
+++ b/Annex/Locations.hs
@@ -63,7 +63,6 @@ module Annex.Locations (
 	gitAnnexSshDir,
 	gitAnnexRemotesDir,
 	gitAnnexAssistantDefaultDir,
-	isLinkToAnnex,
 	HashLevels(..),
 	hashDirMixed,
 	hashDirLower,
@@ -386,15 +385,6 @@ gitAnnexRemotesDir r = addTrailingPathSeparator $ gitAnnexDir r </> "remotes"
 gitAnnexAssistantDefaultDir :: FilePath
 gitAnnexAssistantDefaultDir = "annex"
 
-{- Checks a symlink target to see if it appears to point to annexed content.
- -
- - We only look at paths inside the .git directory, and not at the .git
- - directory itself, because GIT_DIR may cause a directory name other
- - than .git to be used.
- -}
-isLinkToAnnex :: FilePath -> Bool
-isLinkToAnnex s = (pathSeparator:objectDir) `isInfixOf` s
-
 {- Sanitizes a String that will be used as part of a Key's keyName,
  - dealing with characters that cause problems on substandard filesystems.
  -
-- 
cgit v1.2.3