From d41b94fca5748b0e51f7d505641c396328714813 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 7 Oct 2011 04:06:02 -0500 Subject: [PATCH 02/12] post-receive-email: defend against non-utf8 i18n.logoutputencoding setting The post-receive-email example hook includes a description of the repository taken from $GIT_DIR/description in the emails it sends. Gitweb also uses that file and assumes it to be UTF-8. When [i18n] logoutputencoding is not UTF-8, the result is a message composed with multiple encodings. This patch teaches post-receive-email to use plumbing where possible and to explicitly declare what encoding it expects output to use so the output uses UTF-8 consistently. Making the email charset configurable is left as an exercise for the interested reader. Reported-by: Alexey Shumkin Helped-by: Johannes Sixt Signed-off-by: Jonathan Nieder --- contrib/hooks/post-receive-email | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index dc184d0..b59e03c 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -464,7 +464,7 @@ generate_delete_branch_email() echo " was $oldrev" echo "" echo $LOGBEGIN - git show -s --pretty=oneline $oldrev + git diff-tree --encoding=UTF-8 -s --pretty=oneline $oldrev echo $LOGEND } @@ -540,11 +540,11 @@ generate_atag_email() # performed on them if [ -n "$prevtag" ]; then # Show changes since the previous release - git rev-list --pretty=short "$prevtag..$newrev" | git shortlog + git shortlog --encoding=UTF-8 "$prevtag..$newrev" else # No previous tag, show all the changes since time # began - git rev-list --pretty=short $newrev | git shortlog + git shortlog --encoding=UTF-8 "$newrev" fi ;; *) @@ -564,7 +564,7 @@ generate_delete_atag_email() echo " was $oldrev" echo "" echo $LOGBEGIN - git show -s --pretty=oneline $oldrev + git diff-tree --encoding=UTF-8 -s --pretty=oneline $oldrev echo $LOGEND } @@ -610,7 +610,7 @@ generate_general_email() echo "" if [ "$newrev_type" = "commit" ]; then echo $LOGBEGIN - git show --no-color --root -s --pretty=medium $newrev + git diff-tree --encoding=UTF-8 --root -s --pretty=oneline $newrev echo $LOGEND else # What can we do here? The tag marks an object that is not @@ -629,7 +629,7 @@ generate_delete_general_email() echo " was $oldrev" echo "" echo $LOGBEGIN - git show -s --pretty=oneline $oldrev + git diff-tree --encoding=UTF-8 -s --pretty=oneline $oldrev echo $LOGEND } -- 1.7.10