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.
This commit is contained in:
parent
dcf42949cb
commit
f9d79d194b
4 changed files with 19 additions and 10 deletions
|
@ -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.
|
||||
-
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue