diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-15 14:17:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-15 14:17:00 -0400 |
| commit | 87f8bb9ef0c701956e42c14e4d667d828e72192b (patch) | |
| tree | 0bb362a28bdad54d41758a6652d40855e9d023a2 | |
| parent | 0f7fb02e61eeef646151e0679a6091e0b27dcb84 (diff) | |
add: In v6 mode, acts on modified files.
Same as was done in direct mode, except in v6 mode add always adds files
locked, so
| -rw-r--r-- | Command/Add.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index a0bcf789e..8cbaf189a 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -66,10 +66,9 @@ seek o = allowConcurrentOutput $ do , startSmall file ) go $ withFilesNotInGit (not $ includeDotFiles o) - ifM isDirect + ifM (versionSupportsUnlockedPointers <||> isDirect) ( go withFilesMaybeModified - , unlessM versionSupportsUnlockedPointers $ - go withFilesOldUnlocked + , go withFilesOldUnlocked ) {- Pass file off to git-add. -} diff --git a/debian/changelog b/debian/changelog index 57c69a1e8..b3612da26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ git-annex (6.20151225) unstable; urgency=medium newly initialized repository; it will add files to the annex. * unlock, lock: In v6 mode, unlocking a file changes it from a symlink to a pointer file, and this change can be committed to the git repository. + * add: In v6 mode, acts on modified files. -- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400 |