diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-16 14:49:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-16 14:49:12 -0400 |
| commit | d7820aa98ad0fe973d0a1aae2861abdab60de7a5 (patch) | |
| tree | 5699a9b4ea84ff89931247fe527e9c0f44e06215 /debian | |
| parent | 0346651ab6ef0c53aa7e0daffd821863858081fe (diff) | |
assistant: Fix race in v6 mode that caused downloaded file content to sometimes not replace pointer files.
The keys database handle needs to be closed after merging, because the
smudge filter, in another process, updates the database. Old cached info
can be read for a while from the open database handle; closing it ensures
that the info written by the smudge filter is available.
This is pretty horribly ad-hoc, and it's especially nasty that the
transferrer closes the database every time.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index af54ed566..e9de8bce8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-annex (6.20160512) UNRELEASED; urgency=medium original branch. * assistant: Fix bug that caused v6 pointer files to be annexed by the assistant. + * assistant: Fix race in v6 mode that caused downloaded file content to + sometimes not replace pointer files. -- Joey Hess <id@joeyh.name> Wed, 11 May 2016 16:08:38 -0400 |