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
27 lines
1.3 KiB
Markdown
27 lines
1.3 KiB
Markdown
Preparing for a release (probably tomorrow or Friday).
|
|
|
|
Part of that was updating the autobuilders. Had to deal with the gnutls
|
|
security hole fix, and upgrading that on the OSX autobuilder turned out to
|
|
be quite complicated due to library version skew. Also, I switched the
|
|
linux autobuilders over to building from Debian unstable, rather than
|
|
stable. That should be ok to do now that the standalone build bundles all
|
|
the libraries it needs... And the arm build has always used unstable, and
|
|
has been reported working on a lot of systems. So I think this will be
|
|
safe, but have backed up the old autobuilder chroots just in case.
|
|
|
|
Also been catching up on bug reports and traffic and
|
|
and dealt with quite a lot of things today. Smarter log file
|
|
rotation for the assistant, better webapp behavior when git is not
|
|
installed, and a fix for the webdav 5 second timeout problem.
|
|
|
|
Perhaps the most interesting change is a new `annex.startupscan` setting,
|
|
which can be disabled to prevent the assistant from doing the expensive
|
|
startup scan. This means it misses noticing any files that changed since it
|
|
last run, but this should be useful for those really big repositories.
|
|
|
|
(Last night, did more work on the test suite, including even more checking
|
|
of merge conflict resolution.)
|
|
|
|
----
|
|
|
|
Today's work was sponsored by Michael Alan Dorman.
|