mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-25 07:30:56 +02:00
Code

git-multimail: update to release 1.3.1

Browse Source 
The changes are described in CHANGES.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2016-05-13 19:00:41 +02:00 committed by Junio C Hamano
parent 5fe494c54a
commit 17130a7046
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/hooks/multimail/CHANGES
View File

@ -1,3 +1,11 @@
Release 1.3.1 (bugfix-only release)
===================================
* Generate links to commits in combined emails (it was done only for
commit emails in 1.3.0).
* Fix broken links on PyPi.
Release 1.3.0
=============

2
contrib/hooks/multimail/README
View File

@ -1,4 +1,4 @@
git-multimail 1.3.0
git-multimail 1.3.1
===================
.. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master

4
contrib/hooks/multimail/README.Git
View File

@ -6,10 +6,10 @@ website:
https://github.com/git-multimail/git-multimail
The version in this directory was obtained from the upstream project
on May 03 2016 and consists of the "git-multimail" subdirectory from
on May 13 2016 and consists of the "git-multimail" subdirectory from
revision
26f3ae9f86aa7f8a054ba89235c4d3879f98b03d refs/tags/1.3.0
3ce5470d4abf7251604cbf64e73a962e1b617f5e refs/tags/1.3.1
Please see the README file in this directory for information about how
to report bugs or contribute to git-multimail.

10
contrib/hooks/multimail/git_multimail.py
View File

@ -1,6 +1,6 @@
#! /usr/bin/env python
__version__ = '1.3.0'
__version__ = '1.3.1'
# Copyright (c) 2015 Matthieu Moy and others
# Copyright (c) 2012-2014 Michael Haggerty and others
@ -1704,6 +1704,14 @@ class BranchChange(ReferenceChange):
self.header_template = COMBINED_HEADER_TEMPLATE
self.intro_template = COMBINED_INTRO_TEMPLATE
self.footer_template = COMBINED_FOOTER_TEMPLATE
def revision_gen_link(base_url):
# revision is used only to generate the body, and
# _content_type is set while generating headers. Get it
# from the BranchChange object.
revision._content_type = self._content_type
return revision.generate_browse_link(base_url)
self.generate_browse_link = revision_gen_link
for line in self.generate_email(push, body_filter, values):
yield line