fix parsing of v6 unlocked file
The newline broke this ad-hoc parser; use the normal one.
This commit is contained in:
parent
5498576c79
commit
b26776d92f
1 changed files with 4 additions and 4 deletions
|
@ -182,13 +182,13 @@ excludeReferenced refspec ks = runfilter firstlevel ks >>= runfilter secondlevel
|
||||||
secondlevel = withKeysReferencedInGit refspec
|
secondlevel = withKeysReferencedInGit refspec
|
||||||
|
|
||||||
{- Given an initial value, folds it with each key referenced by
|
{- Given an initial value, folds it with each key referenced by
|
||||||
- symlinks in the git repo. -}
|
- files in the working tree. -}
|
||||||
withKeysReferenced :: v -> (Key -> v -> v) -> Annex v
|
withKeysReferenced :: v -> (Key -> v -> v) -> Annex v
|
||||||
withKeysReferenced initial a = withKeysReferenced' Nothing initial folda
|
withKeysReferenced initial a = withKeysReferenced' Nothing initial folda
|
||||||
where
|
where
|
||||||
folda k _ v = return $ a k v
|
folda k _ v = return $ a k v
|
||||||
|
|
||||||
{- Runs an action on each referenced key in the git repo. -}
|
{- Runs an action on each referenced key in the working tree. -}
|
||||||
withKeysReferencedM :: (Key -> Annex ()) -> Annex ()
|
withKeysReferencedM :: (Key -> Annex ()) -> Annex ()
|
||||||
withKeysReferencedM a = withKeysReferenced' Nothing () calla
|
withKeysReferencedM a = withKeysReferenced' Nothing () calla
|
||||||
where
|
where
|
||||||
|
@ -271,8 +271,8 @@ withKeysReferencedInGitRef a ref = do
|
||||||
liftIO $ void clean
|
liftIO $ void clean
|
||||||
where
|
where
|
||||||
tKey True = lookupFile . getTopFilePath . DiffTree.file
|
tKey True = lookupFile . getTopFilePath . DiffTree.file
|
||||||
tKey False = fileKey . takeFileName . decodeBS <$$>
|
tKey False = parseLinkOrPointer
|
||||||
catFile ref . getTopFilePath . DiffTree.file
|
<$$> catFile ref . getTopFilePath . DiffTree.file
|
||||||
|
|
||||||
data UnusedMaps = UnusedMaps
|
data UnusedMaps = UnusedMaps
|
||||||
{ unusedMap :: UnusedMap
|
{ unusedMap :: UnusedMap
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue