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

annex.addsmallfiles: New option controlling what is done when adding files not matching annex.largefiles.

Browse source
This commit is contained in:
Joey Hess 2016-01-28 14:04:32 -04:00
parent c7a89ead3a
commit 7c1df36d63
Failed to extract signature
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Command/Add.hs
View file

@ -49,7 +49,10 @@ seek o = allowConcurrentOutput $ do
matcher <- largeFilesMatcher matcher <- largeFilesMatcher
let gofile file = ifM (checkFileMatcher matcher file <||> Annex.getState Annex.force) let gofile file = ifM (checkFileMatcher matcher file <||> Annex.getState Annex.force)
( start file ( start file
, startSmall file , ifM (annexAddSmallFiles <$> Annex.getGitConfig)
( startSmall file
, stop
)
) )
case batchOption o of case batchOption o of
Batch -> batchFiles gofile Batch -> batchFiles gofile

2
Types/GitConfig.hs
View file

@ -54,6 +54,7 @@ data GitConfig = GitConfig
, annexWebDownloadCommand :: Maybe String , annexWebDownloadCommand :: Maybe String
, annexCrippledFileSystem :: Bool , annexCrippledFileSystem :: Bool
, annexLargeFiles :: Maybe String , annexLargeFiles :: Maybe String
, annexAddSmallFiles :: Bool
, annexFsckNudge :: Bool , annexFsckNudge :: Bool
, annexAutoUpgrade :: AutoUpgrade , annexAutoUpgrade :: AutoUpgrade
, annexExpireUnused :: Maybe (Maybe Duration) , annexExpireUnused :: Maybe (Maybe Duration)
@ -99,6 +100,7 @@ extractGitConfig r = GitConfig
, annexWebDownloadCommand = getmaybe (annex "web-download-command") , annexWebDownloadCommand = getmaybe (annex "web-download-command")
, annexCrippledFileSystem = getbool (annex "crippledfilesystem") False , annexCrippledFileSystem = getbool (annex "crippledfilesystem") False
, annexLargeFiles = getmaybe (annex "largefiles") , annexLargeFiles = getmaybe (annex "largefiles")
, annexAddSmallFiles = getbool (annex "addsmallfiles") True
, annexFsckNudge = getbool (annex "fscknudge") True , annexFsckNudge = getbool (annex "fscknudge") True
, annexAutoUpgrade = toAutoUpgrade $ getmaybe (annex "autoupgrade") , annexAutoUpgrade = toAutoUpgrade $ getmaybe (annex "autoupgrade")
, annexExpireUnused = maybe Nothing Just . parseDuration , annexExpireUnused = maybe Nothing Just . parseDuration

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
git-annex (6.20160127) UNRELEASED; urgency=medium
* annex.addsmallfiles: New option controlling what is done when
adding files not matching annex.largefiles.
-- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400
git-annex (6.20160126) unstable; urgency=medium git-annex (6.20160126) unstable; urgency=medium
* Fix nasty reversion in the last release that broke sync --content's * Fix nasty reversion in the last release that broke sync --content's

6
doc/git-annex.mdwn
View file

@ -828,6 +828,12 @@ Here are all the supported configuration settings.
git annex add -c annex.largefiles='include=*' 99kbfile git annex add -c annex.largefiles='include=*' 99kbfile
* `annex.addsmallfiles`
Controls whether small files (not matching annex.largefiles)
should be checked into git by `git annex add`. Defaults to true;
set to false to instead make small files be skipped.
* `annex.numcopies` * `annex.numcopies`
This is a deprecated setting. You should instead use the This is a deprecated setting. You should instead use the