diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-30 16:07:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-30 16:08:09 -0400 |
| commit | 043672e11448516b70c0bea789f94fd3d5e16910 (patch) | |
| tree | 427f067244b46e69163a9db99247ec4be284c1a2 /Annex | |
| parent | 455b02756b9b697879bee8350431f9638fb7afc9 (diff) | |
Fix inverted logic in last release's fix for data loss bug, that caused git-annex sync on FAT or other crippled filesystems to add symlink standin files to the annex.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Link.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Link.hs b/Annex/Link.hs index bb2354c49..becd7e7ec 100644 --- a/Annex/Link.hs +++ b/Annex/Link.hs @@ -37,10 +37,10 @@ isAnnexLink file = maybe Nothing (fileKey . takeFileName) <$> getAnnexLinkTarget getAnnexLinkTarget :: FilePath -> Annex (Maybe LinkTarget) getAnnexLinkTarget file = ifM (coreSymlinks <$> Annex.getGitConfig) ( check readSymbolicLink $ + return Nothing + , check readSymbolicLink $ check probefilecontent $ return Nothing - , check readSymbolicLink $ - return Nothing ) where check getlinktarget fallback = do |