summaryrefslogtreecommitdiff
path: root/Annex/Environment.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Annex/Environment.hs')
-rw-r--r--Annex/Environment.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Environment.hs b/Annex/Environment.hs
index a066e9ab0..4f0fda986 100644
--- a/Annex/Environment.hs
+++ b/Annex/Environment.hs
@@ -33,7 +33,7 @@ checkEnvironment = do
checkEnvironmentIO :: IO ()
checkEnvironmentIO = whenM (isNothing <$> myUserGecos) $ do
- username <- myUserName
+ username <- either (const "unknown") id <$> myUserName
ensureEnv "GIT_AUTHOR_NAME" username
ensureEnv "GIT_COMMITTER_NAME" username
where
@@ -52,7 +52,7 @@ ensureCommit :: Annex a -> Annex a
ensureCommit a = either retry return =<< tryNonAsync a
where
retry _ = do
- name <- liftIO myUserName
+ name <- liftIO $ either (const "unknown") id <$> myUserName
setConfig (ConfigKey "user.name") name
setConfig (ConfigKey "user.email") name
a