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

add: Stage modified non-large files when running in indirect mode.

Browse source 
(This was already done in v6 mode and direct mode.)
This commit is contained in:
Joey Hess 2016-12-05 14:02:11 -04:00
parent e9c44536b2
commit f61508aed4
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -14,6 +14,8 @@ git-annex (6.20161119) UNRELEASED; urgency=medium
* fromkey: Accept multiple pairs of files and keys. * fromkey: Accept multiple pairs of files and keys.
Thanks, Daniel Brooks. Thanks, Daniel Brooks.
* rekey: Added --batch mode. * rekey: Added --batch mode.
* add: Stage modified non-large files when running in indirect mode.
(This was already done in v6 mode and direct mode.)
-- Joey Hess <id@joeyh.name> Mon, 21 Nov 2016 11:27:50 -0400 -- Joey Hess <id@joeyh.name> Mon, 21 Nov 2016 11:27:50 -0400

10
Command/Add.hs
View file

@ -41,9 +41,6 @@ optParser desc = AddOptions
) )
<*> parseBatchOption <*> parseBatchOption
{- Add acts on both files not checked into git yet, and unlocked files.
-
- In direct mode, it acts on any files that have changed. -}
seek :: AddOptions -> CommandSeek seek :: AddOptions -> CommandSeek
seek o = allowConcurrentOutput $ do seek o = allowConcurrentOutput $ do
matcher <- largeFilesMatcher matcher <- largeFilesMatcher
@ -59,10 +56,9 @@ seek o = allowConcurrentOutput $ do
NoBatch -> do NoBatch -> do
let go a = a gofile (addThese o) let go a = a gofile (addThese o)
go (withFilesNotInGit (not $ includeDotFiles o)) go (withFilesNotInGit (not $ includeDotFiles o))
ifM (versionSupportsUnlockedPointers <||> isDirect) go withFilesMaybeModified
( go withFilesMaybeModified unlessM (versionSupportsUnlockedPointers <||> isDirect) $
, go withFilesOldUnlocked go withFilesOldUnlocked
)
{- Pass file off to git-add. -} {- Pass file off to git-add. -}
startSmall :: FilePath -> CommandStart startSmall :: FilePath -> CommandStart