aboutsummaryrefslogtreecommitdiff
path: root/Command/Smudge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-09 15:32:22 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-09 15:32:22 -0400
commit17bbf2840159c656a583726f8128d3d665c5c3e1 (patch)
treee2440360ae7ba9f0aa48dbeb4a5007a5f9f7345a /Command/Smudge.hs
parentc152d92e26e7d3b6115a79e2e10546f3e4ddce71 (diff)
Make import --deduplicate and --skip-duplicates only hash once, not twice
import: --deduplicate and --skip-duplicates were implemented inneficiently; they unncessarily hashed each file twice. They have been improved to only hash once. The new approach is to lock down (minimally) and hash files, and then reuse that information when importing them. This was rather tricky, especially in detecting changes to files while they are being imported. The output of import changed slightly. While before it silently skipped over files with eg --skip-duplicates, now it shows each file as it starts to act on it. Since every file is hashed first thing, it would otherwise not be clear what file import is chewing on. (Actually, it wasn't clear before when any of the duplicates switches were used.) This commit was sponsored by Alexander Thompson on Patreon.
Diffstat (limited to 'Command/Smudge.hs')
-rw-r--r--Command/Smudge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Smudge.hs b/Command/Smudge.hs
index 5a4b879dd..cf5272f82 100644
--- a/Command/Smudge.hs
+++ b/Command/Smudge.hs
@@ -88,7 +88,7 @@ clean file = do
<$> catKeyFile file
liftIO . emitPointer
=<< go
- =<< ingest' currbackend
+ =<< (\ld -> ingest' currbackend ld Nothing)
=<< lockDown cfg file
, liftIO $ B.hPut stdout b
)