summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-11 13:56:12 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-11 14:00:21 -0400
commite43f7a080838c87df1e63b5a58875561157a5a85 (patch)
treed8161b0e0142cd4de046d153c8d103ca5268efa7 /Command
parent69a64069bbe72421186d08a8fb28de889caac942 (diff)
only make 1 hardlink max between pointer file and annex object
If multiple files point to the same annex object, the user may want to modify them independently, so don't use a hard link. Also, check diskreserve when copying.
Diffstat (limited to 'Command')
-rw-r--r--Command/Smudge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Smudge.hs b/Command/Smudge.hs
index cd33b193e..1353c2791 100644
--- a/Command/Smudge.hs
+++ b/Command/Smudge.hs
@@ -86,7 +86,7 @@ ingest file = do
}
k <- fst . fromMaybe (error "failed to generate a key")
<$> genKey source backend
- -- Hard link (or copy) file content to annex
+ -- Hard link (or copy) file content to annex object
-- to prevent it from being lost when git checks out
-- a branch not containing this file.
r <- linkAnnex k file