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

comment

Browse source
This commit is contained in:
Joey Hess 2021-12-08 13:42:36 -04:00
parent b060d99fe0
commit 0139b4fa82
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 50 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
doc/bugs/merge-annex-branches__61__false_-_automate_and_extend/comment_1_c3fbb6eb15a510ae9b1af13cd7df028a._comment Normal file
View file

@ -0,0 +1,29 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2021-12-08T17:21:42Z"
content="""
Firstly, you're overstating the problem. This does not affect queries in
all read-only repositories. If the read-only repository does not have any
remote git-annex branches that have not been merged into the local
branch, the query will succeed. Only when there is such an unmerged branch
will there be a permission error when it merges the annex branch.
So, if you eg use `git anenx sync`, you would never end up in a situation
where annex.merge-annex-branches is needed, because the remote git-annex
branches are always merged by it.
Setting annex.merge-annex-branches false manually is one thing,
you know you are changing its behavior. Setting it implicitly due to
permissions is another thing, what would result in git-annex query commands
changing their behavior based on permissions. The previously linked thread
discussed and rejected that idea, and rightly so.
What I would be willing to do would be to have git-annex detect when it
cannot merge remote annex branches, and skip the merging, and instead when
querying the value of a file from the git-annex branch, also query the
values from the unmerged remote branches, and combine them in memory the
same as if a merge had been done. This would make git-annex query
operations slower in this unusual situation, but they would always
have the same result as if it was able to perform the merge.
"""]]

21
doc/bugs/merge-annex-branches__61__false_-_automate_and_extend/comment_2_c33bf0bdf6bf85e4ee9e1286208c0b73._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2021-12-08T17:38:54Z"
content="""
I have not been able to reproduce the
`git -c annex.merge-annex-branches=false annex wanted here`
problem. You apparently have annex.pidlock set since
"locktmp" is used when doing pid locks, but despite setting that and having
an unmerged remote git-annex branch, this is as close as I can get:
nobody@darkstar:/tmp/yyy$ git-annex wanted here
git-annex: /tmp/yyy/.git/annex: openTempFile template locktmp: permission denied (Permission denied)
wanted: 1 failed
nobody@darkstar:/tmp/yyy$ git -c annex.merge-annex-branches=false annex wanted here
nobody@darkstar:/tmp/yyy$
Anyway, this is an entirely different problem and should be in its own bug
report, once you determine how to reproduce it..
"""]]