From a890ac4a2ca4c9580b4a2e3a0c84f0ba249867dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 22 Jul 2013 11:24:10 -0400
Subject: Use user.name and user.email from the .gitconfig file belonging to
 the user who sued or sudoed to root, in preference to making up values for
 that user.

---
 commit.d/50vcs-commit | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'commit.d/50vcs-commit')

diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
index d484626..a700589 100755
--- a/commit.d/50vcs-commit
+++ b/commit.d/50vcs-commit
@@ -41,6 +41,21 @@ fi
 
 if [ "$VCS" = git ] && [ -d .git ]; then
 	if [ -n "$USER" ]; then
+		# Use user.name and user.email from the gitconfig belonging
+		# to the user who became root.
+		USER_HOME="$(perl -e 'print ((getpwnam("joey"))[7])')"
+		if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.gitconfig" ]; then
+			if [ -z "$GIT_AUTHOR_NAME" ]; then
+				GIT_AUTHOR_NAME=$(git config -f "$USER_HOME/.gitconfig" user.name)
+			fi
+			if [ -z "$GIT_AUTHOR_EMAIL" ]; then
+				GIT_AUTHOR_EMAIL=$(git config -f "$USER_HOME/.gitconfig" user.email)
+			fi
+		fi
+		if [ -z "$GIT_COMMITTER_EMAIL" ]; then
+			GIT_COMMITER_EMAIL="$(git config --global user.email)"
+		fi
+
 		if [ -z "$GIT_AUTHOR_NAME" ]; then
 			export GIT_AUTHOR_NAME="$USER"
 		fi
-- 
cgit v1.2.3