summaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-23 12:58:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-23 13:00:45 -0400
commitb77b0848ee28093b63e3ab0d1ea494e430ffe58b (patch)
tree7bcc235a07319bb4461373b5d0656ddc90aad357 /doc/design
parentfb2ccfd60ff09c1b1d03838d42eba3c65fd7fb27 (diff)
repair command: add handling of git-annex branch and index
Diffstat (limited to 'doc/design')
-rw-r--r--doc/design/assistant/disaster_recovery.mdwn14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/design/assistant/disaster_recovery.mdwn b/doc/design/assistant/disaster_recovery.mdwn
index f7e3482b2..798b0fea5 100644
--- a/doc/design/assistant/disaster_recovery.mdwn
+++ b/doc/design/assistant/disaster_recovery.mdwn
@@ -55,7 +55,7 @@ everything) to have the assistant do.
Note that Remote.Git already tries to use this, but the assistant does not
call it for non-local remotes.
-## git fsck
+## git fsck and repair
Add git fsck to scheduled self fsck **done**
@@ -64,11 +64,14 @@ TODO: Add git fsck of local remotes to scheduled remote fscks.
TODO: Display an alert to nudge user to schedule a fsck, if none is
scheduled. Without being annoying about it.
-TODO: If committing to the repository fails, after resolving any dangling lock
-files (see above), it should git fsck.
+TODO: If committing to the repository fails, after resolving any dangling
+lock files (see above), it should git fsck.
If git fsck finds problems, launch git repository repair.
+TODO: git annex fsck --fast at end of repository repair to ensure
+git-annex branch is accurate.
+
TODO: along with displaying alert when there is a problem, send an email
alert. (Using system MTA?)
@@ -144,10 +147,7 @@ that was found for it.
uncommitted. Or if the index is missing/corrupt, any files in the tree will
show as modified and uncommitted. User (or git-annex assistant) can then
commit as appropriate. Print appropriate warning message. **done**
-* TODO: Special handling for git-annex branch: Reset to last good commit
- (or to dummy empty commit is there is not one), and
- then commit `.git/annex/index` over top of that, and then run a
- `git annex fsck --fast` to fix up any object location info.
+* Special handling for git-annex branch and index. **done**
* Remote tracking branches can just be removed, and then `git fetch`
from the remote, which will re-download missing objects from it and
reinstate the tracking branch. **done**