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

avoid using wildcard near bug kyle fixed

Browse source
This commit is contained in:
Joey Hess 2021-01-07 13:44:23 -04:00
parent fd161da2c2
commit 33bcee86f1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Git/Tree.hs
View file

@ -260,7 +260,8 @@ adjustTree adjusttreeitem addtreeitems resolveaddconflict removefiles r repo =
removeset = S.fromList $ map (normalise . gitPath) removefiles removeset = S.fromList $ map (normalise . gitPath) removefiles
removed (TreeBlob f _ _) = S.member (normalise (gitPath f)) removeset removed (TreeBlob f _ _) = S.member (normalise (gitPath f)) removeset
removed (TreeCommit f _ _) = S.member (normalise (gitPath f)) removeset removed (TreeCommit f _ _) = S.member (normalise (gitPath f)) removeset
removed _ = False removed (RecordedSubTree _ _ _) = False
removed (NewSubTree _ _) = False
addoldnew [] new = new addoldnew [] new = new
addoldnew old [] = old addoldnew old [] = old