diff options
| -rwxr-xr-x | commit.d/50vcs-commit | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit index a700589..bc40789 100755 --- a/commit.d/50vcs-commit +++ b/commit.d/50vcs-commit @@ -46,14 +46,14 @@ if [ "$VCS" = git ] && [ -d .git ]; then 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) + GIT_AUTHOR_NAME="$(git config -f "$USER_HOME/.gitconfig" user.name)" || true fi if [ -z "$GIT_AUTHOR_EMAIL" ]; then - GIT_AUTHOR_EMAIL=$(git config -f "$USER_HOME/.gitconfig" user.email) + GIT_AUTHOR_EMAIL="$(git config -f "$USER_HOME/.gitconfig" user.email)" || true fi fi if [ -z "$GIT_COMMITTER_EMAIL" ]; then - GIT_COMMITER_EMAIL="$(git config --global user.email)" + GIT_COMMITER_EMAIL="$(git config --global user.email)" || true fi if [ -z "$GIT_AUTHOR_NAME" ]; then diff --git a/debian/changelog b/debian/changelog index 341d136..8753061 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (1.6) UNRELEASED; urgency=low + + * Guard git config calls. Closes: #717957 + + -- Joey Hess <joeyh@debian.org> Sat, 27 Jul 2013 12:24:11 -0400 + etckeeper (1.5) unstable; urgency=low * Quote user and group names, in case one contains a space. |