delta/git.git/contrib/hooks, branch ss/userdiff-update-csharp-java

git-multimail: update to version 1.0.0

2014-04-07T18:57:11+00:00

This commit contains the squashed changes from the upstream
git-multimail repository since the last code drop.  Highlights:

* Fix encoding of non-ASCII email addresses in email headers.

* Fix backwards-compatibility bugs for older Python 2.x versions.

* Fix a backwards-compatibility bug for Git 1.7.1.

* Add an option commitDiffOpts to customize logs for revisions.

* Pass "-oi" to sendmail by default to prevent premature
  termination
  on a line containing only ".".

* Stagger email "Date:" values in an attempt to help mail clients
  thread the emails in the right order.

* If a mailing list setting is missing, just skip sending the
  corresponding email (with a warning) instead of failing.

* Add a X-Git-Host header that can be used for email filtering.

* Allow the sender's fully-qualified domain name to be configured.

* Minor documentation improvements.

* Add a CHANGES file.

Contributions-by: Raphaël Hertzog 
Contributions-by: Eric Berberich 
Contributions-by: Michiel Holtkamp 
Contributions-by: Malte Swart 
Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

mark contributed hooks executable

2013-11-25T23:01:22+00:00

The docs in contrib/hooks/pre-auto-gc-battery suggest:

	For example, if the hook is stored in
	/usr/share/git-core/contrib/hooks/pre-auto-gc-battery:

	chmod a+x pre-auto-gc-battery
	cd /path/to/your/repository.git
	ln -sf /usr/share/git-core/contrib/hooks/pre-auto-gc-battery \
	     hooks/pre-auto-gc

Unfortunately on multi-user systems most users do not have write
access to /usr.  Better to mark the sample hooks executable in
the first place so users do not have to tweak their permissions to
use them by symlinking into .git/hooks/.

Reported-by: Olivier Berger 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

hooks/post-receive-email: set declared encoding to utf-8

2013-08-05T17:17:38+00:00

Some email clients (e.g., claws-mail) display the message body
incorrectly when the charset is not defined explicitly in a
Content-Type header.  "git log" generates logs in UTF-8 encoding by
default, so add a Content-Type header declaring that encoding to
the emails the post-receive-email example hook sends.

[jn: also setting the Content-Transfer-Encoding so MTAs know what
 kind of mangling might be needed when sending to a non 8-bit clean
 SMTP host]

Requested-by: Alexander Gerasiov 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

hooks/post-receive-email: force log messages in UTF-8

2013-08-05T17:17:36+00:00

Git commands write commit messages in UTF-8 by default, but that
default can be overridden by the [i18n] commitEncoding and
logOutputEncoding settings.  With such a setting, the emails written
by the post-receive-email hook use a mixture of encodings:

 1. Log messages use the configured log output encoding, which is
    meant to be whatever encoding works best with local terminals
    (and does not have much to do with what encoding should be used
    for email)

 2. Filenames are left as is: on Linux, usually UTF-8, and in the Mingw
    port (which uses Unicode filesystem APIs), always UTF-8

 3. The "This is an automated email" preface uses a project description
    from .git/description, which is typically in UTF-8 to support
    gitweb.

So (1) is configurable, and (2) and (3) are unconfigurable and
typically UTF-8.  Override the log output encoding to always use UTF-8
when writing the email to get the best chance of a comprehensible
single-encoding email.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

hooks/post-receive-email: use plumbing instead of git log/show

2013-08-05T17:17:35+00:00

This way the hook doesn't have to keep being tweaked as porcelain
learns new features like color and pagination.

While at it, replace the "git rev-list | git shortlog" idiom with
plain "git shortlog" for simplicity.

Except for depending less on the value of settings like '[log]
abbrevCommit', no change in output intended.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

post-receive-email: deprecate script in favor of git-multimail

2013-07-23T04:20:28+00:00

Add a notice to the top of post-receive-email explaining that the
script is no longer under active development and pointing the user to
git-multimail.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

git-multimail: an improved replacement for post-receive-email

2013-07-15T19:59:48+00:00

Add git-multimail, a tool for generating notification emails for
pushes to a Git repository.  It is largely plug-in compatible with
post-receive-email, and is proposed to eventually replace that script.
The advantages of git-multimail relative to post-receive-email are
described in README.migrate-from-post-receive-email.

git-multimail is organized in a directory contrib/hooks/multimail.
The directory contains:

* git_multimail.py -- a Python module that can generate notification
  emails for pushes to a Git repository.  The file can be used
  directly as a post-receive script (configured via git config
  settings), or it can be imported as a Python module and configured
  via arbitrary Python code.

* README -- user-level documentation for configuring and using
  git-multimail.

* post-receive -- an example of building a post-receive script that
  imports git_multimail.py as a Python module, with an example of how
  to change the email templates.

* README.migrate-from-post-receive-email -- documentation targeted at
  current users of post-receive-email, explaining the differences and
  how to migrate a post-receive-email configuration to git-multimail.

* migrate-mailhook-config -- a script that can migrate a user's
  post-receive-email configuration options to the equivalent
  git-multimail options.

* README.Git -- a short explanation of the relationship between
  git-multimail and the rest of the Git project, plus the exact date
  and revision when this version was taken from the upstream project.

All but the last file are taken verbatim from the upstream
git-multimail project.

git-multimail is originally derived from post-receive-email and also
incorporates suggestions from the mailing list as well as patches by
the people listed below.

Signed-off-by: Michael Haggerty 
Contributions-by: Matthieu Moy 
Contributions-by: Ramkumar Ramachandra 
Contributions-by: Chris Hiestand 
Contributions-by: Michiel Holtkamp 
Contributions-by: Ævar Arnfjörð Bjarmason 
Reviewed-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

contrib/hooks/setgitperms.perl: use a lowercase "usage:" string

2013-02-24T21:31:09+00:00

Make the usage string consistent with Git.

Reviewed-by: Jonathan Nieder 
Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

Add Auto-Submitted header to post-receive-email

2013-01-17T20:47:27+00:00

This conforms to RFC3834 and is useful in preventing eg
vacation auto-responders from replying by default

Signed-off-by: Chris Hiestand 
Reviewed-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Fix spelling error in post-receive-email hook

2012-10-14T04:50:14+00:00

Signed-off-by: Richard Fearn 
Signed-off-by: Junio C Hamano