diff options
| -rw-r--r-- | Annex/Content.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 464b98f05..bffef19f4 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -491,9 +491,11 @@ getKeysPresent = do {- In indirect mode, look for the key. In direct mode, - the inode cache file is only present when a key's content - - is present. -} + - is present, so can be used as a surrogate if the content + - is not located in the annex directory. -} present False d = doesFileExist $ contentfile d - present True d = doesFileExist $ contentfile d ++ ".cache" + present True d = doesFileExist (contentfile d ++ ".cache") + <||> present False d contentfile d = d </> takeFileName d {- Things to do to record changes to content when shutting down. diff --git a/debian/changelog b/debian/changelog index c71ef515c..6c044810e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ git-annex (5.20140211) UNRELEASED; urgency=medium * pre-commit: Update metadata when committing changes to locations of annexed files within a view. * Add progress display for transfers to/from external special remotes. + * unused: Fix to actually detect unused keys when in direct mode. * Windows webapp: Can set up box.com, Amazon S3, and rsync.net remotes * Windows webapp: Can create repos on removable drives. * Windows: Ensure HOME is set, as needed by bundled cygwin utilities. |