diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-01-12 12:40:18 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-12 12:40:18 -0400 |
| commit | 4f88f8f1ec293445a526d163818c72b3a38f9ecf (patch) | |
| tree | a4d19ec71c09372c99083f411a7458a3c88ff518 /src | |
| parent | 358321afad0445e66c0aaaea74c4e80caafb77b4 (diff) | |
| parent | f3d86f4583fdb7626119210503512a6f78b95f5e (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Git.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Git/Config.hs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs index 5a16b3db..949f430b 100644 --- a/src/Propellor/Git.hs +++ b/src/Propellor/Git.hs @@ -4,6 +4,8 @@ import Utility.Process import Utility.Exception import System.Directory +import Control.Applicative +import Prelude getCurrentBranch :: IO String getCurrentBranch = takeWhile (/= '\n') diff --git a/src/Propellor/Git/Config.hs b/src/Propellor/Git/Config.hs index 97835231..f5b6678d 100644 --- a/src/Propellor/Git/Config.hs +++ b/src/Propellor/Git/Config.hs @@ -7,6 +7,8 @@ import Utility.SafeCommand import Utility.Monad import Control.Monad +import Control.Applicative +import Prelude getGitConfigValue :: String -> IO (Maybe String) getGitConfigValue key = do |