diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-22 12:58:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-22 12:58:04 -0400 |
| commit | 034d6fec96f30c479f79a5826ef79b2414545b1f (patch) | |
| tree | 3dad79d984dca06dd9cb60054b0ff08994e19652 /doc | |
| parent | e0f2ec01ceafb0ee3fdd68ef025e1ee31071b13a (diff) | |
index file recovery
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/design/assistant/disaster_recovery.mdwn | 7 | ||||
| -rw-r--r-- | doc/git-recover-repository.mdwn | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/doc/design/assistant/disaster_recovery.mdwn b/doc/design/assistant/disaster_recovery.mdwn index 4b3d2a290..c630a72b4 100644 --- a/doc/design/assistant/disaster_recovery.mdwn +++ b/doc/design/assistant/disaster_recovery.mdwn @@ -148,8 +148,5 @@ that was found for it. if none was found. **done** * (Decided not to touch tags.) -TODO: The index file can still refer to objects that were missing. -This prevents git commit from working. And simply re-staging things doesn't -seem to help; git sees the sha is "known" and does not re-add it, -apparently. So, need to do something to clean up the index, while ideally -not losing any staged changes. +The index file can still refer to objects that were missing. +Rewrite to remove them. **done** diff --git a/doc/git-recover-repository.mdwn b/doc/git-recover-repository.mdwn index f437e5688..dac4a310b 100644 --- a/doc/git-recover-repository.mdwn +++ b/doc/git-recover-repository.mdwn @@ -15,11 +15,12 @@ It does by deleting all corrupt objects, and retreiving all missing objects that it can from the remotes of the repository. If that is not sufficient to fully recover the repository, it can also -reset branches back to commits before the corruption happened, and delete -branches that are no longer available due to the lost data. It will only -do this if run with the `--force` option, since that rewrites history -and throws out missing data. Note that the `--force` option never touches -tags, even if they are no longer usable due to missing data. +reset branches back to commits before the corruption happened, delete +branches that are no longer available due to the lost data, and remove any +missing files from the index. It will only do this if run with the +`--force` option, since that rewrites history and throws out missing data. +Note that the `--force` option never touches tags, even if they are no +longer usable due to missing data. After running this command, you will probably want to run `git fsck` to verify it fixed the repository. Note that fsck may still complain about |