From e23a7598e296c23d1ee485d73cb21604f33e7d2a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 May 2013 11:52:04 -0400 Subject: [PATCH] set EMAIL when GECOS workaround is needed Git fails on Android, because it gets some weird domain for local host like "localhost.(none)". This works around that. I made it always set EMAIL when GECOS workaround was needed (unless EMAIL is already set). It might be nicer to try to get the hostname.domain as git does, and only set it if that fails. But I don't want to be stuck trying to exactly duplicate whatever git is doing. --- Annex/Environment.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Annex/Environment.hs b/Annex/Environment.hs index 357ad6958d..9e59453605 100644 --- a/Annex/Environment.hs +++ b/Annex/Environment.hs @@ -1,6 +1,6 @@ {- git-annex environment - - - Copyright 2012 Joey Hess + - Copyright 2012, 2013 Joey Hess - - Licensed under the GNU GPL version 3 or higher. -} @@ -12,6 +12,7 @@ import Utility.UserInfo import qualified Git.Config import System.Posix.Env +import Network.BSD {- Checks that the system's environment allows git to function. - Git requires a GECOS username, or suitable git configuration, or @@ -29,3 +30,5 @@ checkEnvironmentIO = do -- existing environment is not overwritten setEnv "GIT_AUTHOR_NAME" username False setEnv "GIT_COMMITTER_NAME" username False + hostname <- getHostName + setEnv "EMAIL" (username ++ "@" ++ hostname) False