mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

smudge: Print a warning when annex.thin is set, as git's smudge interface does not allow honoring that configuration.

Browse source
This commit is contained in:
Joey Hess 2016-04-13 13:34:24 -04:00
parent c47d7d0f7e
commit 402e5adab8
Failed to extract signature
4 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/git-annex.mdwn
View file

@ -932,8 +932,8 @@ Here are all the supported configuration settings.
Set this to `true` to make unlocked files be a hard link to their content
in the annex, rather than a second copy. (Only when supported by the file
system, and only in repository version 6.) This can save considerable
disk space, but modification made to a file will lose the local (and
possibly only) copy of the old version. So, enable with care.
disk space, but when a modification is made to a file, you will lose the
local (and possibly only) copy of the old version. So, enable with care.
After setting (or unsetting) this, you should run `git annex fix` to
fix up the annexed files in the work tree to be hard links (or copies).

13
doc/tips/unlocked_files.mdwn
View file

@ -135,6 +135,11 @@ make the second copy not be worth keeping:
In situations like these, you may want to avoid the overhead of the second
local copy of unlocked files. There's a config setting for that.
[[!template id=note text="""
Note that setting annex.thin only has any effect on systems that support
hard links. It is supported on Windows, but not on FAT filesystems.
"""]]
git config annex.thin true
After changing annex.thin, you'll want to fix up the work tree to
@ -142,8 +147,12 @@ match the new setting:
git annex fix
Note that setting annex.thin only has any effect on systems that support
hard links. It is supported on Windows, but not on FAT filesystems.
Unfortunately, git's smudge interface does not let git-annex honor
the annex.thin configuration when git is checking out a file.
So, using `git checkout` to check out a different branch, or even
`git merge` can result in some non-thin files making their way into the
working tree, and using more disk space. A warning will be printed out in
this situation. You can always run `git annex fix` to re-thin such files.
## tradeoffs