New option 'mergediffs'.

 ``--mergediffs <branches>``
        Lists branches for which merges should include the full diff,
        including all changes that are already part of branch commits.
        ``<branches>`` is a list of command-separated names of heads
        to treat this way.

Author: rsmmr

CHANGES

@@ -1,4 +1,8 @@
 
+0.3-16 | 2011-08-18 10:31:05 -0700
+
+  * Now showing diffs for merges as well. (Robin Sommer)
+
 0.3-15 | 2011-08-12 09:07:27 -0700
 
   * Updating CHANGES. (Robin Sommer)

README

@@ -194,6 +194,12 @@ address, do ``git config hooks.mailinglist [email protected]``:
         (re-)generation of this output, and does not change the
         current notifier state in any way.
 
+    ``--mergediffs <branches>``
+        Lists branches for which merges should include the full diff,
+        including all changes that are already part of branch commits.
+        ``<branches>`` is a list of command-separated names of heads
+        to treat this way.
+
     ``--maxdiffsize <size in KB>``
         Limits the size of mails by giving a maximum number of bytes
         that a diff may have. If the diff for a change is larger

VERSION

@@ -1 +1 @@
-0.3-15
+0.3-16

git-notifier

@@ -39,6 +39,7 @@ Options = [
     ("updateonly", False, False, "update state file only, no mails"),
     ("users", True, None, "location of a user-to-email mapping file"),
     ("replyto", True, None, "email address for reply-to header"),
+    ("mergediffs", True, set(), "branches for which complete merge diffs are to be included"),
     ]
 
 class State:
@@ -116,6 +117,9 @@ class GitConfig:
         if self.allchanges and not isinstance(self.allchanges, set):
             self.allchanges = set([head.strip() for head in self.allchanges.split(",")])
 
+        if self.mergediffs and not isinstance(self.mergediffs, set):
+            self.mergediffs = set([head.strip() for head in self.mergediffs.split(",")])
+
         if not self.debug:
             self.log = open(self.log, "a")
         else:
@@ -404,7 +408,7 @@ def commit(current, rev, force=False, subject_head=None):
     merge_diff = "--cc"
 
     for head in heads:
-        if head in head in Config.allchanges:
+        if head in Config.allchanges or head in Config.mergediffs:
             merge_diff = "-m"
 
     subject = git("show '--pretty=format:%%s (%%h)' -s %s" % rev)