aboutsummaryrefslogtreecommitdiff
path: root/Annex/Ingest.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-22 18:03:47 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-22 18:03:47 -0400
commitd43fab19ea60b9e26b7daafaa316e53c7d58dd40 (patch)
tree188c3cda0ee3217bfb9c8581c67bfb2316d5a867 /Annex/Ingest.hs
parenta8d013c98a83dc641591174e76f4de848d95d2fe (diff)
clean up cruft in assistant fast rename code path
Diffstat (limited to 'Annex/Ingest.hs')
-rw-r--r--Annex/Ingest.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/Annex/Ingest.hs b/Annex/Ingest.hs
index 36930baf4..b2eb27616 100644
--- a/Annex/Ingest.hs
+++ b/Annex/Ingest.hs
@@ -150,7 +150,7 @@ ingest (Just (LockedDown lockingfile source)) = withTSDelta $ \delta -> do
case r of
LinkAnnexFailed -> failure "failed to link to annex"
_ -> do
- finishIngestUnlocked key source
+ finishIngestUnlocked' key source
success key (Just cache) s
gounlocked _ _ _ = failure "failed statting file"
@@ -181,6 +181,11 @@ finishIngestDirect key source = do
finishIngestUnlocked :: Key -> KeySource -> Annex ()
finishIngestUnlocked key source = do
+ cleanCruft source
+ finishIngestUnlocked' key source
+
+finishIngestUnlocked' :: Key -> KeySource -> Annex ()
+finishIngestUnlocked' key source = do
Database.Keys.addAssociatedFile key (keyFilename source)
populateAssociatedFiles key source