diff options
| -rwxr-xr-x | commit.d/50vcs-commit | 11 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit index 86fe8fb..8a0c0b6 100755 --- a/commit.d/50vcs-commit +++ b/commit.d/50vcs-commit @@ -2,20 +2,31 @@ set -e message="$1" +hostname=`hostname -f` if [ "$VCS" = git ] && [ -d .git ]; then + if [ -n "$SUDO_USER" ]; then + export GIT_COMMITTER_NAME="$SUDO_USER" + export GIT_COMMITTER_EMAIL="$SUDO_USER@$hostname" + fi if [ -n "$message" ]; then git commit $GIT_COMMIT_OPTIONS -m "$message" else git commit $GIT_COMMIT_OPTIONS fi elif [ "$VCS" = hg ] && [ -d .hg ]; then + if [ -n "$SUDO_USER" ]; then + export LOGNAME="$SUDO_USER" + fi if [ -n "$message" ]; then hg commit $HG_COMMIT_OPTIONS -m "$message" else hg commit $HG_COMMIT_OPTIONS fi elif [ "$VCS" = bzr ] && [ -d .bzr ]; then + if [ -n "$SUDO_USER" ]; then + export EMAIL="$SUDO_USER <$SUDO_USER@$hostname>" + fi if [ -n "$message" ]; then bzr commit $BZR_COMMIT_OPTIONS -m "$message" else diff --git a/debian/changelog b/debian/changelog index 968e1d7..3819f34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +etckeeper (0.27) UNRELEASED; urgency=low + + * Use SUDO_USER as the committer if set. Closes: #498739 + (Thierry Carrez) + + -- Joey Hess <joeyh@debian.org> Wed, 28 Jan 2009 13:35:16 -0500 + etckeeper (0.26) unstable; urgency=low * Add Japanese debconf translation. Closes: #512869 |