undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option hooks.diffopts to customize change summary in post-receive-email

Browse Source 
This makes it easy to customize the git diff-tree options, for example
to include -p to include inline diffs.

It defaults to the current options "--stat --summary --find-copies-harder"
and thus is backward-compatible.

Signed-off-by: Jon Jensen <jon@endpoint.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jon Jensen 2011-08-03 21:36:08 -06:00 committed by Junio C Hamano
parent 6a319e393b
commit 0d7c01c991
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/hooks/post-receive-email
View File

@ -60,6 +60,11 @@
# email body. If not specified, there is no limit. # email body. If not specified, there is no limit.
# Lines beyond the limit are suppressed and counted, and a final # Lines beyond the limit are suppressed and counted, and a final
# line is added indicating the number of suppressed lines. # line is added indicating the number of suppressed lines.
# hooks.diffopts
# Alternate options for the git diff-tree invocation that shows changes.
# Default is "--stat --summary --find-copies-harder". Add -p to those
# options to include a unified diff of changes in addition to the usual
# summary output.
# #
# Notes # Notes
# ----- # -----
@ -446,7 +451,7 @@ generate_update_branch_email()
# non-fast-forward updates. # non-fast-forward updates.
echo "" echo ""
echo "Summary of changes:" echo "Summary of changes:"
git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev git diff-tree $diffopts $oldrev..$newrev
} }
# #
@ -723,6 +728,8 @@ envelopesender=$(git config hooks.envelopesender)
emailprefix=$(git config hooks.emailprefix || echo '[SCM] ') emailprefix=$(git config hooks.emailprefix || echo '[SCM] ')
custom_showrev=$(git config hooks.showrev) custom_showrev=$(git config hooks.showrev)
maxlines=$(git config hooks.emailmaxlines) maxlines=$(git config hooks.emailmaxlines)
diffopts=$(git config hooks.diffopts)
: ${diffopts:="--stat --summary --find-copies-harder"}
# --- Main loop # --- Main loop
# Allow dual mode: run from the command line just like the update hook, or # Allow dual mode: run from the command line just like the update hook, or