# [PATCH] Add option hooks.emaildiff to include full diff in post-receive-email 3 messages from 2011-08-03 to 2011-08-04. Participants: Jon Jensen, Junio C Hamano. Thread: https://gitlist.dev/t/28002 ## Jon Jensen, 2011-08-03 03:34 Subject: [PATCH] Add option hooks.emaildiff to include full diff in post-receive-email Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.02.1108022132230.3386%40ybpnyubfg6.ybpnyqbznva6 ``` I've always found that a very important part of receiving email notification of commits is being able to read the diff inline, easily, where I can reply and quote the diff and make comments. It's similar to the reason patches sent to the Git mailing list need to be inline, not attachments. Since post-receive-email didn't have that option, this adds it as a boolean config variable, hooks.emaildiff. Signed-off-by: Jon Jensen --- contrib/hooks/post-receive-email | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 21989fc..5b9b26d 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -60,6 +60,9 @@ # email body. If not specified, there is no limit. # Lines beyond the limit are suppressed and counted, and a final # line is added indicating the number of suppressed lines. +# hooks.emaildiff +# If set, then a full diff of changes is sent in addition to the default +# summary output. # # Notes # ----- @@ -445,8 +448,13 @@ generate_update_branch_email() # - including the undoing of previous revisions in the case of # non-fast-forward updates. echo "" - echo "Summary of changes:" - git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev + if [ -n "$emaildiff" ]; then + echo "Summary of changes and diff:" + git diff-tree --stat --summary --find-copies-harder -p $oldrev..$newrev + else + echo "Summary of changes:" + git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev + fi } # @@ -723,6 +731,7 @@ envelopesender=$(git config hooks.envelopesender) emailprefix=$(git config hooks.emailprefix || echo '[SCM] ') custom_showrev=$(git config hooks.showrev) maxlines=$(git config hooks.emailmaxlines) +emaildiff=$(git config hooks.emaildiff) # --- Main loop # Allow dual mode: run from the command line just like the update hook, or -- 1.7.6.233.gd79bc ``` ## Junio C Hamano, 2011-08-03 18:52 Subject: Re: [PATCH] Add option hooks.emaildiff to include full diff in post-receive-email Message-ID: <7vr552ba4e.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vr552ba4e.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Jon Jensen writes: > - echo "Summary of changes:" > - git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev > + if [ -n "$emaildiff" ]; then > + echo "Summary of changes and diff:" > + git diff-tree --stat --summary --find-copies-harder -p $oldrev..$newrev > + else > + echo "Summary of changes:" > + git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev > + fi Depending on the project, people may want to customize other aspects of the summary generation, e.g. rejecting the overhead of -f-c-h. Why not do it like this intead? diffopts=$(git config hooks.diffopts) : ${diffopts:="--stat --summary --find-copies-harder"} echo "Summary of changes:" git diff-tree $diffopts $oldrev..$newrev ``` ## Jon Jensen, 2011-08-04 03:36 Subject: [PATCH] Add option hooks.diffopts to customize change summary in post-receive-email Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.02.1108032117240.12142%40ybpnyubfg6.ybpnyqbznva6 In-Reply-To: <7vr552ba4e.fsf@alter.siamese.dyndns.org> ``` 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 Improved-by: Junio C Hamano --- Thanks for the suggestion, Junio. It makes a lot of sense. Jon contrib/hooks/post-receive-email | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 9c678e6..cd5664d 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -60,6 +60,11 @@ # email body. If not specified, there is no limit. # Lines beyond the limit are suppressed and counted, and a final # 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 # ----- @@ -447,7 +452,7 @@ generate_update_branch_email() # non-fast-forward updates. echo "" echo "Summary of changes:" - git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev + git diff-tree $diffopts $oldrev..$newrev } # @@ -724,6 +729,8 @@ envelopesender=$(git config hooks.envelopesender) emailprefix=$(git config hooks.emailprefix || echo '[SCM] ') custom_showrev=$(git config hooks.showrev) maxlines=$(git config hooks.emailmaxlines) +diffopts=$(git config hooks.diffopts) +: ${diffopts:="--stat --summary --find-copies-harder"} # --- Main loop # Allow dual mode: run from the command line just like the update hook, or -- 1.7.6.233.gd79bc ```