diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
commit | 36852d90bc18cb7b2bddb1ce9dce39cc1f0203de (patch) | |
tree | 0419a1d67f6bb9db4ce79f8cb76b53752e2d7371 /Git/CatFile.hs | |
parent | efe7e174bfab4d0dd2e88e7b6eb859940b2228ea (diff) | |
download | git-repair-36852d90bc18cb7b2bddb1ce9dce39cc1f0203de.tar.gz |
Merge from git-annex.
Diffstat (limited to 'Git/CatFile.hs')
-rw-r--r-- | Git/CatFile.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Git/CatFile.hs b/Git/CatFile.hs index d0bcef4..c63a064 100644 --- a/Git/CatFile.hs +++ b/Git/CatFile.hs @@ -1,6 +1,6 @@ {- git cat-file interface - - - Copyright 2011, 2013 Joey Hess <joey@kitenet.net> + - Copyright 2011, 2013 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -110,4 +110,4 @@ catTree h treeref = go <$> catObjectDetails h treeref parsemodefile b = let (modestr, file) = separate (== ' ') (decodeBS b) in (file, readmode modestr) - readmode = fst . fromMaybe (0, undefined) . headMaybe . readOct + readmode = fromMaybe 0 . fmap fst . headMaybe . readOct |