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 | |
| 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.
| -rw-r--r-- | Annex/Link.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior.mdwn | 2 |
3 files changed, 7 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 diff --git a/debian/changelog b/debian/changelog index a60d36f63..ca5bbd52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ git-annex (4.20130724) UNRELEASED; urgency=low Like drop, dropunused checks remotes, and honors the global annex.numcopies setting. (However, .gitattributes settings cannot 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. * Add status message to XMPP presence tag, to identify to others that the client is a git-annex client. Closes: #717652 diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior.mdwn b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior.mdwn index 92ec1c71b..4c1f0971d 100644 --- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior.mdwn +++ b/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior.mdwn @@ -109,3 +109,5 @@ $ cat file.txt # The committed content, discarding the """]] Tell me if you need further information. + +> [[fixed|done]] --[[Joey]] |