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

update

Browse source
This commit is contained in:
Joey Hess 2013-10-18 15:26:19 -04:00
parent 6bbbe6fa5d
commit f5709e7fca
1 changed files with 7 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

@ -118,16 +118,16 @@ branch -- have to first delete the .git/HEAD file if it points to the
broken ref.) broken ref.)
The basic idea then is to reset the branch to the last good commit The basic idea then is to reset the branch to the last good commit
that was found for it. (Or if no good commit was found, reset the branch to that was found for it.
a synthetic commit of an empty tree.) The details of how to do that
depends on the branch:
* For the HEAD branch, can just reset it. This will * For the HEAD branch, can just reset it. (If no last good commit was found
for the HEAD branch, reset it to a dummy empty commit.) This will
leave git showing any changes made since then as staged in the index and leave git showing any changes made since then as staged in the index and
uncommitted. Or if the index is missing/corrupt, any files in the tree will 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 show as modified and uncommitted. User (or git-annex assistant) can then
commit as appropriate. Print appropriate warning message. commit as appropriate. Print appropriate warning message.
* Special handling for git-annex branch: Reset to last good commit, and * 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 then commit `.git/annex/index` over top of that, and then run a
`git annex fsck --fast` to fix up any object location info. `git annex fsck --fast` to fix up any object location info.
* Remote tracking branches can just be removed, and then `git fetch` * Remote tracking branches can just be removed, and then `git fetch`
@ -135,4 +135,5 @@ depends on the branch:
reinstate the tracking branch. reinstate the tracking branch.
* For other branches (or tags), it's best to not rewrite them, because * For other branches (or tags), it's best to not rewrite them, because
that could get really confusing. Instead, delete the old broken branch, that could get really confusing. Instead, delete the old broken branch,
and make a "recovered/$branch" that holds the last good commit. and make a "recovered/$branch" that holds the last good commit (if one
was found).