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

allow adjusttreeitem to remove submodules

Browse source
This commit is contained in:
Joey Hess 2021-03-12 13:19:23 -04:00
commit 4b57e1c0ad
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Git/Tree.hs
View file

@ -240,10 +240,11 @@ adjustTree adjusttreeitem addtreeitems resolveaddconflict removefiles r repo =
Just CommitObject -> do Just CommitObject -> do
let ti = TreeItem (LsTree.file i) (LsTree.mode i) (LsTree.sha i) let ti = TreeItem (LsTree.file i) (LsTree.mode i) (LsTree.sha i)
v <- adjusttreeitem ti v <- adjusttreeitem ti
let commit = tc $ fromMaybe ti v case v of
go h wasmodified (commit:c) depth intree is Nothing -> go h True c depth intree is
where Just (TreeItem f m s) ->
tc (TreeItem f m s) = TreeCommit f m s let commit = TreeCommit f m s
in go h wasmodified (commit:c) depth intree is
_ -> error ("unexpected object type \"" ++ decodeBS (LsTree.typeobj i) ++ "\"") _ -> error ("unexpected object type \"" ++ decodeBS (LsTree.typeobj i) ++ "\"")
| otherwise = return (c, wasmodified, i:is) | otherwise = return (c, wasmodified, i:is)