mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

unused: When large files are checked right into git, avoid buffering their contents in memory.

Browse source 
This makes it a little bit slower since it has to check file size,
but worth it to fix a potential memory use problem.

This commit was sponsored by Fernando Jimenez on Patreon.
This commit is contained in:
Joey Hess 2017-01-31 19:07:24 -04:00
parent 9eb10caa27
commit 062286135c
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -9,6 +9,8 @@ git-annex (6.20170102) UNRELEASED; urgency=medium
* config: New command for storing configuration in the git-annex branch. * config: New command for storing configuration in the git-annex branch.
* stack.yaml: Update to lts-7.18. * stack.yaml: Update to lts-7.18.
* Some optimisations to string splitting code. * Some optimisations to string splitting code.
* unused: When large files are checked right into git, avoid buffering
their contents in memory.
-- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400 -- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400

4
Command/Unused.hs
View file

@ -25,7 +25,6 @@ import qualified Git.LsFiles as LsFiles
import qualified Git.DiffTree as DiffTree import qualified Git.DiffTree as DiffTree
import qualified Remote import qualified Remote
import qualified Annex.Branch import qualified Annex.Branch
import Annex.Link
import Annex.CatFile import Annex.CatFile
import Annex.WorkTree import Annex.WorkTree
import Types.RefSpec import Types.RefSpec
@ -272,8 +271,7 @@ withKeysReferencedDiff a getdiff extractsha = do
go d = do go d = do
let sha = extractsha d let sha = extractsha d
unless (sha == nullSha) $ unless (sha == nullSha) $
(parseLinkOrPointer <$> catObject sha) catKey sha >>= maybe noop a
>>= maybe noop a
{- Filters out keys that have an associated file that's not modified. -} {- Filters out keys that have an associated file that's not modified. -}
associatedFilesFilter :: [Key] -> Annex [Key] associatedFilesFilter :: [Key] -> Annex [Key]