diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-15 18:11:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-15 18:19:36 -0400 |
| commit | 95d2391f58ae240e7100f0d5488dd7246f71f3bb (patch) | |
| tree | f33f21904ae7be4d40b70bab1e2a68fd4eef5526 /Git/UnionMerge.hs | |
| parent | b7e0d39abbc9a09c21c6f0103ad6c9f4547f81fe (diff) | |
more partial function removal
Left a few Prelude.head's in where it was checked not null and too hard to
remove, etc.
Diffstat (limited to 'Git/UnionMerge.hs')
| -rw-r--r-- | Git/UnionMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index a9a51007f..d5323af1d 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -134,7 +134,7 @@ hashObject repo content = getSha subcmd $ do calcMerge :: [(Ref, [L.ByteString])] -> Either Ref [L.ByteString] calcMerge shacontents | null reuseable = Right $ new - | otherwise = Left $ fst $ head reuseable + | otherwise = Left $ fst $ Prelude.head reuseable where reuseable = filter (\c -> sorteduniq (snd c) == new) shacontents new = sorteduniq $ concat $ map snd shacontents |