diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-28 18:17:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-28 18:17:10 -0400 |
| commit | 60e3e2509878b35b22935164983aebfdf41357bb (patch) | |
| tree | 7976b805f3e913a5a65ea71f47344c04782168d1 /Annex | |
| parent | bf186b4e0c4124daac55ea913e96997acabff797 (diff) | |
use a Set
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Difference.hs | 4 | ||||
| -rw-r--r-- | Annex/DirHashes.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Difference.hs b/Annex/Difference.hs index 07789e7bb..66dc03a32 100644 --- a/Annex/Difference.hs +++ b/Annex/Difference.hs @@ -34,7 +34,7 @@ setDifferences = do otherds <- allDifferences <$> recordedDifferences ds <- mappend otherds . annexDifferences <$> Annex.getGitConfig when (ds /= mempty) $ do - ds'@(Differences l) <- ifM (isJust <$> getVersion) + ds' <- ifM (isJust <$> getVersion) ( do oldds <- recordedDifferencesFor u when (ds /= oldds) $ @@ -53,6 +53,6 @@ setDifferences = do return otherds else return ds ) - forM_ l $ \d -> + forM_ (listDifferences ds') $ \d -> setConfig (ConfigKey $ differenceConfigKey d) (differenceConfigVal d) recordDifferences ds' u diff --git a/Annex/DirHashes.hs b/Annex/DirHashes.hs index b58b5a215..03769350d 100644 --- a/Annex/DirHashes.hs +++ b/Annex/DirHashes.hs @@ -42,7 +42,7 @@ branchHashLevels = configHashLevels OneLevelBranchHash configHashLevels :: Difference -> GitConfig -> HashLevels configHashLevels d config - | hasDifference (== d) (annexDifferences config) = HashLevels 1 + | hasDifference d (annexDifferences config) = HashLevels 1 | otherwise = def branchHashDir :: GitConfig -> Key -> String |