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
17 lines
907 B
Markdown
17 lines
907 B
Markdown
Fixed a bug that one or two people had mentioned years ago, but I was never
|
|
able to reproduce myself or get anyone to reproduce in a useful way. It
|
|
caused log files that were supposed to be committed to the git-annex branch
|
|
to end up in master. Turned out to involve weird stuff when the environment
|
|
contains two different settings for a single variable. So was easily fixed
|
|
at last. (I'm pretty sure the code would have never had this bug if
|
|
Data.AssocList was not buried inside an xml library, which rather
|
|
discourages using it when dealing with the environment.)
|
|
|
|
Also worked on, and hopefully fixed, another OSX cpu optimisations problem.
|
|
This one involving shared libraries that git-annex uses for XMPP.
|
|
|
|
Also made the assistant detect corrupt .git/annex/index files on startup
|
|
and remove them. It was already able to recover from corrupt .git/index
|
|
files.
|
|
|
|
Today's work was sponsored by David Wagner.
|