summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcommit.d/50vcs-commit2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
index bc40789..3a4c819 100755
--- a/commit.d/50vcs-commit
+++ b/commit.d/50vcs-commit
@@ -43,7 +43,7 @@ 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])')"
+ USER_HOME="$(perl -e 'print ((getpwnam(shift()))[7])' "$USER")"
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)" || true
diff --git a/debian/changelog b/debian/changelog
index d0defb1..c706d17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+etckeeper (1.7) UNRELEASED; urgency=low
+
+ * Fix hilarious typo hardcoding my name. Closes: #718425
+
+ -- Joey Hess <joeyh@debian.org> Wed, 31 Jul 2013 11:33:10 -0400
+
etckeeper (1.6) unstable; urgency=low
* Guard git config calls. Closes: #717957