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
23 lines
1.2 KiB
Markdown
23 lines
1.2 KiB
Markdown
In order to remove some hackishness in `git annex sync --content`, I
|
|
finally fixed a bad design decision I made back at the very beginning
|
|
(before I really knew haskell) when I built the command seek code, which
|
|
had led to a kind of inversion of control. This took most of a night, but
|
|
it made a lot of code in git-annex clearer, and it makes the command
|
|
seeking code much more flexible in what it can do. Some of the oldest, and
|
|
worst code in git-annex was removed in the process.
|
|
|
|
Also, I've been reworking the numcopies configuration, to allow for a
|
|
[[todo/preferred_content_numcopies_check]]. That will let the assistant,
|
|
as well as `git annex sync --content` proactively make copies when
|
|
needed in order to satisfy numcopies.
|
|
|
|
As part of this, `git config annex.numcopies` is deprecated, and there's a
|
|
new `git annex numcopies N` command that sets the numcopies value that will
|
|
be used by any clone of a repository.
|
|
|
|
I got the preferred content checking of numcopies working too. However,
|
|
I am unsure if checking for per-file .gitattributes annex.numcopies
|
|
settings will make preferred content expressions be, so I have left
|
|
that out for now.
|
|
|
|
Today's work was sponsored by Josh Taylor.
|