mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

assistant: Fix bug that could cause incoming pushes to not get merged into the local tree.

Browse source 
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!
This commit is contained in:
Joey Hess 2013-04-30 16:35:55 -04:00
parent bcb23eca4b
commit e363cefcb3
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -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