summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command/WebApp.hs2
-rw-r--r--Git/Config.hs14
2 files changed, 11 insertions, 5 deletions
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index ae37b324c..f44053250 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -105,7 +105,7 @@ firstRun = do
putMVar v ""
takeMVar v
mainthread v _url htmlshim = do
- browser <- webBrowser <$> Git.Config.global
+ browser <- maybe Nothing webBrowser <$> Git.Config.global
openBrowser browser htmlshim
_wait <- takeMVar v
diff --git a/Git/Config.hs b/Git/Config.hs
index fb0c24bab..00d1ddba2 100644
--- a/Git/Config.hs
+++ b/Git/Config.hs
@@ -58,11 +58,17 @@ read' repo = go repo
}
{- Gets the global git config, returning a dummy Repo containing it. -}
-global :: IO Repo
+global :: IO (Maybe Repo)
global = do
- repo <- Git.Construct.fromUnknown
- withHandle StdoutHandle createProcessSuccess p $
- hRead repo
+ home <- myHomeDir
+ ifM (doesFileExist $ home </> ".gitconfig")
+ ( do
+ repo <- Git.Construct.fromUnknown
+ repo' <- withHandle StdoutHandle createProcessSuccess p $
+ hRead repo
+ return $ Just repo'
+ , return Nothing
+ )
where
params = ["config", "--null", "--list", "--global"]
p = (proc "git" params)