From 5df9d1b98787303f724dfc4e6f423d6e2817aac3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Jan 2016 14:14:28 -0400 Subject: Support ~/.config/git/config when determining the author name and email. Thanks, Richard Savio --- commit.d/50vcs-commit | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'commit.d/50vcs-commit') diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit index 89aa6c6..55f0db2 100755 --- a/commit.d/50vcs-commit +++ b/commit.d/50vcs-commit @@ -55,11 +55,23 @@ if [ "$VCS" = git ] && [ -d .git ]; then export GIT_AUTHOR_EMAIL fi fi + if [ -z "$GIT_AUTHOR_NAME" ] || [ -z "$GIT_AUTHOR_EMAIL" ]; then + if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.config/git/config" ]; then + if [ -z "$GIT_AUTHOR_NAME" ]; then + GIT_AUTHOR_NAME="$(git config -f "$USER_HOME/.config/git/config" user.name)" || true + export GIT_AUTHOR_NAME + fi + if [ -z "$GIT_AUTHOR_EMAIL" ]; then + GIT_AUTHOR_EMAIL="$(git config -f "$USER_HOME/.config/git/config" user.email)" || true + export GIT_AUTHOR_EMAIL + fi + fi + fi + if [ -z "$GIT_COMMITTER_EMAIL" ]; then GIT_COMMITTER_EMAIL="$(git config --global user.email)" || true export GIT_COMMITTER_EMAIL fi - if [ -z "$GIT_AUTHOR_NAME" ]; then GIT_AUTHOR_NAME="$USER" export GIT_AUTHOR_NAME -- cgit v1.2.3