Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Jan 2009 23:07:37 +0000 (23:07 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Jan 2009 23:07:37 +0000 (23:07 +0000)
Conflicts:
stgit/commands/files.py
stgit/commands/mail.py
stgit/git.py

stgit/commands/files.py
stgit/commands/mail.py

index 84925af..a2ed6a2 100644 (file)
@@ -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:
index cab896b..46e4b55 100644 (file)
@@ -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