diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-03 16:57:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-03 16:57:21 -0400 |
| commit | e621a2feac9734b90df74df16e6908f249f76304 (patch) | |
| tree | ec4ecf27281a507fa9bd745363e456b1d0154a26 /doc | |
| parent | eb932d259c605cf58fda4a61d051c469ef4531bf (diff) | |
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/design/assistant/disaster_recovery.mdwn | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/design/assistant/disaster_recovery.mdwn b/doc/design/assistant/disaster_recovery.mdwn index 28dd41c5a..e4d0f37f5 100644 --- a/doc/design/assistant/disaster_recovery.mdwn +++ b/doc/design/assistant/disaster_recovery.mdwn @@ -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 |