8680c415de
Always merge the git-annex branch into .git/annex/index before making a commit from the index. This ensures that, when the branch has been changed in any way (by a push being received, or changes pulled directly into it, or even by the user checking it out, and committing a change), the index reflects those changes. This is much too slow; it needs to be optimised to only update the index when the branch has really changed, not every time. Also, there is an unhandled race, when a change is made to the branch right after the index gets updated. I left it in for now because it's unlikely and I didn't want to complicate things with additional locking yet. |
||
|---|---|---|
| .. | ||
| Branch.hs | ||
| CatFile.hs | ||
| Content.hs | ||
| Exception.hs | ||
| Queue.hs | ||
| Ssh.hs | ||
| UUID.hs | ||
| Version.hs | ||