summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-03 17:05:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-03 17:05:53 -0400
commit97603b8ad6f6e883de73464a1b36a2514ba4b453 (patch)
treefc46535c5a91d3c5ac609384a932a0ee7fb6bd58
parent5d959f8bacd816ef3c2a5ccb4f04d56179c2d382 (diff)
another lock file
-rw-r--r--doc/bugs/Stale_lock_files_on_Android.mdwn4
-rw-r--r--doc/design/assistant/disaster_recovery.mdwn2
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/bugs/Stale_lock_files_on_Android.mdwn b/doc/bugs/Stale_lock_files_on_Android.mdwn
index 77ebc0890..a7b0d3342 100644
--- a/doc/bugs/Stale_lock_files_on_Android.mdwn
+++ b/doc/bugs/Stale_lock_files_on_Android.mdwn
@@ -35,3 +35,7 @@ fatal: Unable to create '/mnt/sdcard/reference/.git/index.lock': File exists.
# End of transcript or log.
"""]]
+
+> The '/mnt/sdcard/reference/.git/index.lock' lock file will now be
+> automatically dealt with. Have not done anything about the refs/remotes
+> lock files yet. --[[Joey]]
diff --git a/doc/design/assistant/disaster_recovery.mdwn b/doc/design/assistant/disaster_recovery.mdwn
index e4d0f37f5..64094387e 100644
--- a/doc/design/assistant/disaster_recovery.mdwn
+++ b/doc/design/assistant/disaster_recovery.mdwn
@@ -18,6 +18,8 @@ check that nothing else is using it, fix the problem, and redo the commit.
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.
+* TODO Seems that refs can also have stale lock files, for example
+ '/storage/emulated/legacy/DCIM/.git/refs/remotes/flick_phonecamera/synced/git-annex.lock'
## incremental fsck