Use SUDO_USER as the committer if set. Closes: #498739 (Thierry Carrez)

diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
index 86fe8fbec2f8df389c720133150816e9763714c0..8a0c0b6a56c09d1153cd3d813c3534eb9a00418f 100755 (executable)
--- 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 968e1d79ac496f6bf4f321e82bc717f502dd1982..3819f34b64e268d12582cec4aa5e6e7063c4fdc3 100644 (file)
--- 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