From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 28 Jan 2009 23:07:37 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~49
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/baf8241d1b7835ba31125d2b75683601ee2b0403?hp=e799c7fa7f55b27d78f5bccdddb86f78260bf955

Merge branch 'stable'

Conflicts:
	stgit/commands/files.py
	stgit/commands/mail.py
	stgit/git.py
---

diff --git a/stgit/commands/files.py b/stgit/commands/files.py
index 84925af..a2ed6a2 100644
--- a/stgit/commands/files.py
+++ b/stgit/commands/files.py
@@ -59,7 +59,8 @@ def func(parser, options, args):
     rev2 = git_id(crt_series, '%s' % patch)
 
     if options.stat:
-        output = gitlib.diffstat(git.diff(rev1 = rev1, rev2 = rev2))
+        output = gitlib.diffstat(git.diff(rev1 = rev1, rev2 = rev2,
+                                          diff_flags = options.diff_flags))
     elif options.bare:
         output = git.barefiles(rev1, rev2)
     else:
diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index cab896b..46e4b55 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -404,7 +404,8 @@ def __build_cover(tmpl, patches, msg_id, options):
                                                 for p in patches),
                  'diffstat':     gitlib.diffstat(git.diff(
                      rev1 = git_id(crt_series, '%s^' % patches[0]),
-                     rev2 = git_id(crt_series, '%s' % patches[-1])))}
+                     rev2 = git_id(crt_series, '%s' % patches[-1]),
+                     diff_flags = options.diff_flags))}
 
     try:
         msg_string = tmpl % tmpl_dict