summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-25 18:17:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-25 18:17:54 -0400
commita0f689bcd87c63fe6efdc5ad112a44241d74259e (patch)
treee6fc62c9a058e7dd37ff440c4f9252f1f5a34ccb /Git
parent2ae218333249132c54360013c7c7f8c07594fa67 (diff)
Use USER and HOME environment when set, and only fall back to getpwent, which doesn't work with LDAP or NIS.
Diffstat (limited to 'Git')
-rw-r--r--Git/Config.hs1
-rw-r--r--Git/Construct.hs1
2 files changed, 2 insertions, 0 deletions
diff --git a/Git/Config.hs b/Git/Config.hs
index cc9b27b69..0d6d67fc0 100644
--- a/Git/Config.hs
+++ b/Git/Config.hs
@@ -15,6 +15,7 @@ import Common
import Git
import Git.Types
import qualified Git.Construct
+import Utility.UserInfo
{- Returns a single git config setting, or a default value if not set. -}
get :: String -> String -> Repo -> String
diff --git a/Git/Construct.hs b/Git/Construct.hs
index 3d39b0801..663303c15 100644
--- a/Git/Construct.hs
+++ b/Git/Construct.hs
@@ -27,6 +27,7 @@ import Common
import Git.Types
import Git
import qualified Git.Url as Url
+import Utility.UserInfo
{- Finds the git repository used for the cwd, which may be in a parent
- directory. -}