summaryrefslogtreecommitdiff
path: root/Command/Unannex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-28 22:43:51 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-28 22:43:51 -0400
commitda9cd315beb03570b96f83063a39e799fe01b166 (patch)
tree61fdc79dd54dccf1792cf3ccadcc584e0119d077 /Command/Unannex.hs
parent2b3c120506f1f25b4c3d0e19342b9826bde0b3b5 (diff)
add support for using hashDirLower in addition to hashDirMixed
Supporting multiple directory hash types will allow converting to a different one, without a flag day. gitAnnexLocation now checks which of the possible locations have a file. This means more statting of files. Several places currently use gitAnnexLocation and immediately check if the returned file exists; those need to be optimised.
Diffstat (limited to 'Command/Unannex.hs')
-rw-r--r--Command/Unannex.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index b9190ce04..e97b6d05d 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -55,7 +55,7 @@ cleanup file key = do
if fast
then do
-- fast mode: hard link to content in annex
- src <- fromRepo $ gitAnnexLocation key
+ src <- inRepo $ gitAnnexLocation key
liftIO $ do
createLink src file
allowWrite file