diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-30 16:35:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-30 16:37:13 -0400 |
| commit | 31b9d2dcd1b32f564fa44fe5a7cc6526536a6f8f (patch) | |
| tree | 0ea87a6208459f73f74f593e42aabd7fc25ed832 /debian | |
| parent | baec0e627d5ea31131729274415041c01de2bcf0 (diff) | |
assistant: Fix bug that could cause incoming pushes to not get merged into the local tree.
Observed that the pushed refs were received, but not merged into master.
The merger never saw an add event for these refs. Either git is not writing
to a new file and renaming it into place, or the inotify code didn't notice
that. Changed it to also watch for modify events and that seems to have
fixed it!
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 d3b520424..47ff23bf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,8 @@ git-annex (4.20130418) UNRELEASED; urgency=low when you or the friend have multiple reposotories on an XMPP account. Note that XMPP pairing with your own devices still pairs with all repositories using your XMPP account. + * assistant: Fix bug that could cause incoming pushes to not get + merged into the local tree. -- Joey Hess <joeyh@debian.org> Thu, 18 Apr 2013 16:22:48 -0400 |