projects
/
git-annex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
71e2050
)
add: no need to make pass for old unlocked files in v6
author
Joey Hess
<joeyh@joeyh.name>
Tue, 15 Dec 2015 18:02:53 +0000
(14:02 -0400)
committer
Joey Hess
<joeyh@joeyh.name>
Tue, 15 Dec 2015 18:03:25 +0000
(14:03 -0400)
Command/Add.hs
patch
|
blob
|
history
diff --git
a/Command/Add.hs
b/Command/Add.hs
index f4bdc70c9808123f9caab77cc7052d60f0b73a84..948a0d94cb57904772883c1e3630b1c6c3f39e6b 100644
(file)
--- a/
Command/Add.hs
+++ b/
Command/Add.hs
@@
-33,6
+33,7
@@
import Annex.ReplaceFile
import Utility.Tmp
import Utility.CopyFile
import Annex.InodeSentinal
+import Annex.Version
import Control.Exception (IOException)
@@
-67,7
+68,8
@@
seek o = allowConcurrentOutput $ do
go $ withFilesNotInGit (not $ includeDotFiles o)
ifM isDirect
( go withFilesMaybeModified
- , go withFilesUnlocked
+ , unlessM versionSupportsUnlockedPointers $
+ go withFilesUnlocked
)
{- Pass file off to git-add. -}