diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-26 15:09:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-26 15:09:47 -0400 |
| commit | 7c9d44a3d87b30d097e99d16ac5c91e0b0614654 (patch) | |
| tree | 68321710999b6956a09912705d81cdb26f61eca1 /Annex/View.hs | |
| parent | a0f87e2958c26d4c9c3bb3073fce527c22ea5fe6 (diff) | |
cleanup
Diffstat (limited to 'Annex/View.hs')
| -rw-r--r-- | Annex/View.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Annex/View.hs b/Annex/View.hs index 35f62ec96..f724889af 100644 --- a/Annex/View.hs +++ b/Annex/View.hs @@ -31,7 +31,6 @@ import Logs.View import Utility.Glob import Utility.FileMode import Types.Command -import Config import CmdLine.Action import qualified Data.Set as S @@ -385,10 +384,9 @@ applyView' mkviewedfile getfilemetadata view = do -} withViewChanges :: (ViewedFile -> Key -> CommandStart) -> (ViewedFile -> Key -> CommandStart) -> Annex () withViewChanges addmeta removemeta = do - makeabs <- flip fromTopFilePath <$> gitRepo (diffs, cleanup) <- inRepo $ DiffTree.diffIndex Git.Ref.headRef forM_ diffs handleremovals - forM_ diffs (handleadds makeabs) + forM_ diffs handleadds void $ liftIO cleanup where handleremovals item @@ -396,7 +394,7 @@ withViewChanges addmeta removemeta = do handlechange item removemeta =<< catKey (DiffTree.srcsha item) | otherwise = noop - handleadds makeabs item + handleadds item | DiffTree.dstsha item /= nullSha = handlechange item addmeta =<< catKey (DiffTree.dstsha item) |