remove git-annex branch ref from unmerged refs list

It's queried separately so it was causing extra work to include it.
This commit is contained in:
Joey Hess 2021-12-27 13:33:27 -04:00
parent 6d7ecd9e5d
commit 1e09cf661e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -27,7 +27,6 @@ module Annex.Branch (
createMessage,
commit,
forceCommit,
getBranch,
files,
rememberTreeish,
performTransitions,
@ -184,7 +183,7 @@ updateTo' pairs = do
- query operations still work, although they will need to do
- additional work since the refs are not merged. -}
catchPermissionDenied
(const (return (UpdateFailedPermissions (branchref : map fst tomerge))))
(const (return (UpdateFailedPermissions (map fst tomerge))))
(go branchref tomerge)
where
excludeset s = filter (\(r, _) -> S.notMember r s)
@ -463,7 +462,7 @@ commitIndex' jl branchref message basemessage retrynum parents = do
{- Lists all files on the branch. including ones in the journal
- that have not been committed yet. There may be duplicates in the list. -}
tfiles :: Annex ([RawFilePath], IO Bool)
files :: Annex ([RawFilePath], IO Bool)
files = do
_ <- update
(bfs, cleanup) <- branchFiles