diff options
author | Joey Hess <joey@kitenet.net> | 2011-12-11 14:51:20 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-12-11 15:05:53 -0400 |
commit | 8680c415dedcc1fdbbcc0b9cdd7e37e860b22130 (patch) | |
tree | 073641a052f833cda6222a19b1cf1c91c41ee94d /.gitattributes | |
parent | 59971c923029a6f10c47a526e7878130637c139e (diff) |
slow, stupid, and safe index updating
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.
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions