add: Stage modified non-large files when running in indirect mode.
(This was already done in v6 mode and direct mode.)
This commit is contained in:
parent
e9c44536b2
commit
f61508aed4
2 changed files with 5 additions and 7 deletions
|
@ -14,6 +14,8 @@ git-annex (6.20161119) UNRELEASED; urgency=medium
|
|||
* fromkey: Accept multiple pairs of files and keys.
|
||||
Thanks, Daniel Brooks.
|
||||
* 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
|
||||
|
||||
|
|
|
@ -41,9 +41,6 @@ optParser desc = AddOptions
|
|||
)
|
||||
<*> 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 o = allowConcurrentOutput $ do
|
||||
matcher <- largeFilesMatcher
|
||||
|
@ -59,10 +56,9 @@ seek o = allowConcurrentOutput $ do
|
|||
NoBatch -> do
|
||||
let go a = a gofile (addThese o)
|
||||
go (withFilesNotInGit (not $ includeDotFiles o))
|
||||
ifM (versionSupportsUnlockedPointers <||> isDirect)
|
||||
( go withFilesMaybeModified
|
||||
, go withFilesOldUnlocked
|
||||
)
|
||||
go withFilesMaybeModified
|
||||
unlessM (versionSupportsUnlockedPointers <||> isDirect) $
|
||||
go withFilesOldUnlocked
|
||||
|
||||
{- Pass file off to git-add. -}
|
||||
startSmall :: FilePath -> CommandStart
|
||||
|
|
Loading…
Add table
Reference in a new issue