diff options
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/CheckAttr.hs | 7 | ||||
| -rw-r--r-- | Git/UnionMerge.hs | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Git/CheckAttr.hs b/Git/CheckAttr.hs index 1ea38beea..0d3e798a1 100644 --- a/Git/CheckAttr.hs +++ b/Git/CheckAttr.hs @@ -36,10 +36,9 @@ lookup attr files repo = do , Param attr , Params "-z --stdin" ] repo - topair l = (file, value) + topair l = (Git.Filename.decode file, value) where - file = Git.Filename.decode $ join sep $ take end bits - value = bits !! end - end = length bits - 1 + file = join sep $ beginning bits + value = end bits !! 0 bits = split sep l sep = ": " ++ attr ++ ": " 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 |