avoid using wildcard near bug kyle fixed
This commit is contained in:
parent
fd161da2c2
commit
33bcee86f1
1 changed files with 2 additions and 1 deletions
|
@ -260,7 +260,8 @@ adjustTree adjusttreeitem addtreeitems resolveaddconflict removefiles r repo =
|
|||
removeset = S.fromList $ map (normalise . gitPath) removefiles
|
||||
removed (TreeBlob 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 old [] = old
|
||||
|
|
Loading…
Add table
Reference in a new issue