diff options
| -rw-r--r-- | doc/bugs/git-annex_branch_corruption.mdwn | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/bugs/git-annex_branch_corruption.mdwn b/doc/bugs/git-annex_branch_corruption.mdwn index 5249e63d8..9c864d85f 100644 --- a/doc/bugs/git-annex_branch_corruption.mdwn +++ b/doc/bugs/git-annex_branch_corruption.mdwn @@ -36,11 +36,14 @@ fixed. Probably git-annex needs to record which ref of the git-annex branch corresponds to its index, and if the branch is at a different ref, -merge it into the index. I am still considering how to do that atomically; -what if a push comes in while git-annex is updating its index? - -> Now git-annex always updates the index with the git-annex branch, which -> is a slow, but safe way to avoid this problem. [[done]] --[[Joey]] +merge it into the index. + +> And now that's [[done]]. I managed to do it with very little slowdown. +> +> A side benefit is that users can now safely check out the git-annex +> branch and commit changes to it, and git-annex will notice them. +> Before, it was documented to ignore such changes. +> --[[Joey]] --- |