Merge branch 'master' into desymlink

This commit is contained in:
Joey Hess 2012-12-13 00:46:10 -04:00
commit ffdd08fd2e
33 changed files with 97 additions and 100 deletions

View file

@ -125,7 +125,7 @@ remoteNamed n constructor = do
return $ r { remoteName = Just n }
{- Sets the name of a remote based on the git config key, such as
"remote.foo.url". -}
- "remote.foo.url". -}
remoteNamedFromKey :: String -> IO Repo -> IO Repo
remoteNamedFromKey k = remoteNamed basename
where

View file

@ -11,7 +11,7 @@ import Common
import Git.Types
{- Runs an action that causes a git subcommand to emit a Sha, and strips
any trailing newline, returning the sha. -}
- any trailing newline, returning the sha. -}
getSha :: String -> IO String -> IO Sha
getSha subcommand a = maybe bad return =<< extractSha <$> a
where