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

annex.merge-annex-branches

Browse source 
Added annex.merge-annex-branches config setting which can be used to
disable automatic merge of git-annex branches.

I wonder if git-annex merge/sync/assistant should disable this
setting? Not sure yet, so have not done so. May be that users will not set
it in git config, but pass it via -c to commands that need it.

Checking the config setting adds a very small overhead, but it's
only checked once per command so should be insignificant.

This commit was supported by the NSF-funded DataLad project.
This commit is contained in:
Joey Hess 2018-02-22 14:25:32 -04:00
parent addb91b24b
commit 09e73a3ab6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 59 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
doc/bugs/impossible_to_perform___34__read-only__34___git_annex_info_without_write_permissions/comment_3_05f7eec04634e5b4e200cf3dca1bb1b1._comment Normal file
View file

@ -0,0 +1,33 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2018-02-22T17:27:06Z"
content="""
There are situations where a git command that appears to be read-only,
such as `git status` actually writes to the repository behind the scenes.
It looks like git ignores write errors in at least some such cases. So
there is precident for implicit read-only support, but I think not in cases
where it would involve significant behavior changes, like it would for the
git-annex branch auto-merging. In git's case the behavior change probably
only involves repeated `git status` runs being slower than otherwise,
or something like that.
As well as populating the .git/annex/index file with information merged in from
recently fetched git-annex branches, git-annex may need to write to other files
in order to prepare caches needed to perform what appears to be "read-only"
query operation, or to lock files in order to prevent someone who does have
write access from dropping them in a situation where that will lose data.
An example of the latter is running `git annex drop` in a repository you do have
write access to, and it needing to exclusively lock files in origin,
which requires write access to origin as well. Without write access,
the drop may fail.
The --read-only flag seems to be setting up a situation where git-annex handles
some things being read-only, but then someone expects the flag to
make some other thing work read-only, which git-annex can't manage to support
for whatever reason.
So I prefer a more specific name, like annex.merge-annex-branches=false.
Implemented that.
"""]]