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

comment and warning

Browse source
This commit is contained in:
Joey Hess 2015-07-02 15:21:25 -04:00
parent 4af3dc72c1
commit a099dc3f6a
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/bugs/Corrupted_.git__47__annex__47__index_when_running_assistant/comment_6_f0999dbd00e06ab2cbf68b58527c2b9b._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 6"""
date="2015-07-02T19:14:40Z"
content="""
Yeah, --prune=now is bad news when using git-annex. At least, if
you might be doing it at the same time that git-annex is staging
objects in the index.
Using it in combination with annex.alwayscommit=false is a particularly
foot-shootish thing. I've added a warning to its documentation.
`git gc` uses a lock file, `.git/gc.pid`. It might be possible for
git-annex to hold that lock when it's in the process of staging and
committing objects, to avoid `git gc` running at such times.
"""]]

4
doc/git-annex.mdwn
View file

@ -862,6 +862,10 @@ Here are all the supported configuration settings.
commit the data by running `git annex merge` (or by automatic merges) commit the data by running `git annex merge` (or by automatic merges)
or `git annex sync`. or `git annex sync`.
Note that you beware running `git gc` if using this configuration,
since it could garbage collect objects that are staged in git-annex's
index but not yet committed.
* `annex.hardlink` * `annex.hardlink`
Set this to `true` to make file contents be hard linked into the Set this to `true` to make file contents be hard linked into the