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 /debian | |
| 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 'debian')
| -rw-r--r-- | debian/changelog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5c68fde2d..405e98b74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,11 @@ git-annex (3.20111204) UNRELEASED; urgency=low remote, by running git commit, pull, and push for you. * Version monad-control dependency in cabal file. * Fix bug in last version in getting contents from bare repositories. + * Ensure that git-annex branch changes are merged into git-annex's index, + which fixes a bug that could cause changes that were pushed to the + git-annex branch to get reverted. As a side effect, it's now safe + for users to check out and commit changes directly to the git-annex + branch. -- Joey Hess <joeyh@debian.org> Sun, 04 Dec 2011 12:22:37 -0400 |