summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-01-06 17:24:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-01-06 17:24:22 -0400
commit6c8c925cc41eef6dd7770654ddc881ac3832d2d5 (patch)
treeccbd39db21d9755d93df522bd5b339d228f04fe8 /Annex
parent456fa69f30962328c733b5fb25b1a657b93b88bb (diff)
add works in direct mode
Also, changed sync to no longer automatically add files in direct mode. That was only necessary before because add didn't work.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Direct.hs11
1 files changed, 1 insertions, 10 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index cd0d1c3b9..9ef808163 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -55,16 +55,7 @@ stageDirect = do
(Just key, Nothing, _) -> deletedannexed file key
(Nothing, Nothing, _) -> deletegit file
(_, Just _, _) -> addgit file
- go (file, Nothing) = do
- mstat <- liftIO $ catchMaybeIO $ getSymbolicLinkStatus file
- case (mstat, toCache =<< mstat) of
- (Nothing, _) -> noop
- (Just stat, Just cache)
- | isSymbolicLink stat -> addgit file
- | otherwise -> void $ addDirect file cache
- (Just stat, Nothing)
- | isSymbolicLink stat -> addgit file
- | otherwise -> noop
+ go _ = noop
modifiedannexed file oldkey cache = do
void $ removeAssociatedFile oldkey file