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

watcher: Detect at startup time when there is a stale .git/lock, and remove it so it does not interfere with the automatic commits of changed files.

Browse source
This commit is contained in:
Joey Hess 2013-10-03 16:57:21 -04:00
parent f8880c4fe4
commit 93dbb7842e
4 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
doc/design/assistant/disaster_recovery.mdwn
View file

@ -7,8 +7,17 @@ There are a few ways a git repository can get broken that are easily fixed.
One is left over index.lck files. When a commit to a repository fails,
check that nothing else is using it, fix the problem, and redo the commit.
This should be done on both the current repository and any local
repositories. Maybe also make git-annex-shell be able to do it remotely?
* **done** for .git/annex/index.lock, can be handled safely and automatically.
* **done** for .git/index.lock, only when the assistant is starting up.
* What about local remotes, eg removable drives? git-annex does attempt
to commit to the git-annex branch of those. It will use the atomatic
fix if any are dangling. It does not commit to the master branch; indeed
a removable drive typically has a bare repository. So I think nothing to
do here.
* What about git-annex-shell? If the ssh remote has the assistant running,
it can take care of it, and if not, it's a server, and perhaps the user
should be required to fix up if it crashes during a commit. This should
not affect the assistant anyway.
## incremental fsck