diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-27 15:59:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-27 15:59:59 -0400 |
| commit | 60c88820987596809091ee010e6be2a083888bc8 (patch) | |
| tree | dc2540c6deadfcf3efee1fd95948bcbd6f219db5 /Command/Smudge.hs | |
| parent | 17490f3685aee698e10555c5dc3e915a317c2250 (diff) | |
annex.thin
Decided it's too scary to make v6 unlocked files have 1 copy by default,
but that should be available to those who need it. This is consistent with
git-annex not dropping unused content without --force, etc.
* Added annex.thin setting, which makes unlocked files in v6 repositories
be hard linked to their content, instead of a copy. This saves disk
space but means any modification of an unlocked file will lose the local
(and possibly only) copy of the old version.
* Enable annex.thin by default on upgrade from direct mode to v6, since
direct mode made the same tradeoff.
* fix: Adjusts unlocked files as configured by annex.thin.
Diffstat (limited to 'Command/Smudge.hs')
| -rw-r--r-- | Command/Smudge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Smudge.hs b/Command/Smudge.hs index bde440f7e..80c79554e 100644 --- a/Command/Smudge.hs +++ b/Command/Smudge.hs @@ -100,7 +100,7 @@ ingestLocal file = do -- 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 ic + r <- linkToAnnex k file ic case r of LinkAnnexFailed -> error "Problem adding file to the annex" LinkAnnexOk -> logStatus k InfoPresent |