needed pull gitpython-developers#43 from gitpython-developers/GitPython @f362d10fa24395c21b1629923ccd705ba73ae996

Author: inderpreet99

git/util.py

@@ -13,6 +13,10 @@
 import tempfile
 import platform
 
+# Import the user database on unix based systems
+if os.name == "posix":
+    import pwd
+
 from gitdb.util import (
 							make_sha, 
 							LockedFD, 
@@ -113,12 +117,17 @@ def assure_directory_exists(path, is_file=False):
 
 def get_user_id():
 	""":return: string identifying the currently active system user as name@node
-	:note: user can be set with the 'USER' environment variable, usually set on windows"""
-	ukn = 'UNKNOWN'
-	username = os.environ.get('USER', os.environ.get('USERNAME', ukn))
-	if username == ukn and hasattr(os, 'getlogin'):
-		username = os.getlogin()
-	# END get username from login
+	:note: user can be set with the 'USER' environment variable, usually set on windows
+	:note: on unix based systems you can use the password database
+	to get the login name of the effective process user"""
+        if os.name == "posix":
+                username = pwd.getpwuid(os.geteuid()).pw_name
+        else:
+	        ukn = 'UNKNOWN'
+	        username = os.environ.get('USER', os.environ.get('USERNAME', ukn))
+	        if username == ukn and hasattr(os, 'getlogin'):
+		        username = os.getlogin()
+	        # END get username from login
 	return "%s@%s" % (username, platform.node())
 
 #} END utilities