e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
29 lines
1.6 KiB
Markdown
29 lines
1.6 KiB
Markdown
John Millikin came through and fixed that haskell-gnutls segfault
|
|
on OSX that I developed a reproducible test case for the other day.
|
|
It's a bit hard to test, since the bug doesn't always happen, but the
|
|
fix is already deployed for Mountain Lion autobuilder.
|
|
|
|
However, I then found another way to make haskell-gnutls segfault, more
|
|
reliably on OSX, and even sometimes on Linux. Just entering the wrong XMPP
|
|
password in the assistant can trigger this crash. Hopefully John will work
|
|
his magic again.
|
|
|
|
---
|
|
|
|
Meanwhile, I fixed the sync-after-forget problem. Now sync always forces
|
|
its push of the git-annex branch (as does the assistant). I considered but
|
|
rejected having sync do the kind of uuid-tagged branch push that the
|
|
assistant sometimes falls back to if it's failing to do a normal sync. It's
|
|
ugly, but worse, it wouldn't work in the workflow where multiple clients
|
|
are syncing to a central bare repository, because they'd not pull down the
|
|
hidden uuid-tagged branches, and without the assistant running on the
|
|
repository, nothing would ever merge their data into the git-annex branch.
|
|
Forcing the push of synced/git-annex was easy, once I satisfied myself
|
|
that it was always ok to do so.
|
|
|
|
Also factored out a module that knows about all the different log files
|
|
stored on the git-annex branch, which is all the support infrastructure
|
|
that will be needed to make `git annex forget --drop-dead` work. Since this
|
|
is basically a routing module, perhaps I'll get around to making it use
|
|
a nice bidirectional routing library like
|
|
[Zwaluw](http://hackage.haskell.org/package/Zwaluw) one day.
|