handle overBranchFileContents with read-only unmerged git-annex branches
This makes --all error out in that situation. Which is better than ignoring information from the branches. To really handle the branches right, overBranchFileContents would need to both query all the branches and union merge file contents (or perhaps not provide any file content), as well as diffing between branches to find files that are only present in the unmerged branches. And also, it would need to handle transitions.. Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
parent
d9d0fe5fa4
commit
7f6b2ca49c
4 changed files with 35 additions and 7 deletions
|
@ -282,7 +282,9 @@ withKeyOptions' ko auto mkkeyaction fallbackaction worktreeitems = do
|
|||
keyaction Nothing (SeekInput [], k, mkActionItem k)
|
||||
go reader
|
||||
Nothing -> return ()
|
||||
Annex.Branch.overBranchFileContents getk go
|
||||
Annex.Branch.overBranchFileContents getk go >>= \case
|
||||
Just r -> return r
|
||||
Nothing -> giveup "This repository is read-only, and there are unmerged git-annex branches, which prevents operating on all keys. (Set annex.merge-annex-branches to false to ignore the unmerged git-annex branches.)"
|
||||
|
||||
runkeyaction getks = do
|
||||
keyaction <- mkkeyaction
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue