diff options
author | Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
commit | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (patch) | |
tree | 08705fab60c11d4073734a8c2500a88b1aab7852 /Annex/CatFile.hs | |
parent | 3e55a8f164d67d5bd1ef86ae2f38fb2c6c3a51b2 (diff) | |
parent | 94554782894ec6c26da3b46312d5d1d16d596458 (diff) |
Merge branch 'master' into desymlink
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
Diffstat (limited to 'Annex/CatFile.hs')
-rw-r--r-- | Annex/CatFile.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs index cde9d5170..161554f29 100644 --- a/Annex/CatFile.hs +++ b/Annex/CatFile.hs @@ -38,11 +38,11 @@ catObjectDetails ref = do catFileHandle :: Annex Git.CatFile.CatFileHandle catFileHandle = maybe startup return =<< Annex.getState Annex.catfilehandle - where - startup = do - h <- inRepo Git.CatFile.catFileStart - Annex.changeState $ \s -> s { Annex.catfilehandle = Just h } - return h + where + startup = do + h <- inRepo Git.CatFile.catFileStart + Annex.changeState $ \s -> s { Annex.catfilehandle = Just h } + return h {- From the Sha of a symlink back to the key. -} catKey :: Sha -> Annex (Maybe Key) |