]> dgit.raspbian.org Git - git-annex.git/commit
handle overBranchFileContents with read-only unmerged git-annex branches
authorJoey Hess <joeyh@joeyh.name>
Mon, 27 Dec 2021 18:30:51 +0000 (14:30 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 27 Dec 2021 18:30:51 +0000 (14:30 -0400)
commit7f6b2ca49cd6f6b6dd6cc9e96d0232a213a82e63
tree92b65183f1921b283ab0b3786bb96a1537ac1e2c
parentd9d0fe5fa46d81fab0ef54114b4c264acc8dcf98
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
Annex/Branch.hs
CmdLine/Seek.hs
Command/ImportFeed.hs
doc/git-annex.mdwn