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.

This commit is contained in:
Joey Hess 2013-07-30 16:07:47 -04:00
parent a8475e18c9
commit 7b0970b340
3 changed files with 7 additions and 2 deletions

View file

@ -37,10 +37,10 @@ isAnnexLink file = maybe Nothing (fileKey . takeFileName) <$> getAnnexLinkTarget
getAnnexLinkTarget :: FilePath -> Annex (Maybe LinkTarget) getAnnexLinkTarget :: FilePath -> Annex (Maybe LinkTarget)
getAnnexLinkTarget file = ifM (coreSymlinks <$> Annex.getGitConfig) getAnnexLinkTarget file = ifM (coreSymlinks <$> Annex.getGitConfig)
( check readSymbolicLink $ ( check readSymbolicLink $
return Nothing
, check readSymbolicLink $
check probefilecontent $ check probefilecontent $
return Nothing return Nothing
, check readSymbolicLink $
return Nothing
) )
where where
check getlinktarget fallback = do check getlinktarget fallback = do

3
debian/changelog vendored
View file

@ -7,6 +7,9 @@ git-annex (4.20130724) UNRELEASED; urgency=low
Like drop, dropunused checks remotes, and honors the global Like drop, dropunused checks remotes, and honors the global
annex.numcopies setting. (However, .gitattributes settings cannot annex.numcopies setting. (However, .gitattributes settings cannot
apply to unused files.) apply to unused files.)
* 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.
* importfeed can be used to import files from podcast feeds. * importfeed can be used to import files from podcast feeds.
* Add status message to XMPP presence tag, to identify to others that * Add status message to XMPP presence tag, to identify to others that
the client is a git-annex client. Closes: #717652 the client is a git-annex client. Closes: #717652

View file

@ -109,3 +109,5 @@ $ cat file.txt # The committed content, discarding the
"""]] """]]
Tell me if you need further information. Tell me if you need further information.
> [[fixed|done]] --[[Joey]]