diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-28 13:18:19 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-28 13:18:19 -0400 |
| commit | 6a8efb186432cd9b8fa7a61f8129303f5bcc9e1f (patch) | |
| tree | 05d97349ecfa1ceac04b0f8c4e797948047ba113 | |
| parent | 3f19db2bc387fcf5a968d9654fdd2338e6e69be9 (diff) | |
only simplify Version differences
Eg, [ObjectHashLower True, ObjectHashLower False] is not the same as [ObjectHashLower False]
| -rw-r--r-- | Types/Difference.hs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Types/Difference.hs b/Types/Difference.hs index cbfad0fce..7d0c28224 100644 --- a/Types/Difference.hs +++ b/Types/Difference.hs @@ -68,8 +68,7 @@ instance Monoid Differences where defver :: Difference defver = Version 5 --- Larger values of the same Difference constructor dominate --- over smaller values, so given [Version 6, Version 5], returns [Version 6] +-- Given [Version 6, Version 5], returns [Version 6] simplify :: [Difference] -> [Difference] simplify = go . sort where @@ -80,9 +79,6 @@ simplify = go . sort | otherwise = d1 : go (d2:ds) like (Version _) (Version _) = True - like (ObjectHashLower _) (ObjectHashLower _) = True - like (ObjectHashDirectories _) (ObjectHashDirectories _) = True - like (BranchHashDirectories _) (BranchHashDirectories _) = True like _ _ = False getDifferences :: Git.Repo -> Differences |