[sysadmin-bin: 109/168] Remove split_lines reference

[Andrea Veri <av src gnome org>]

commit e7ff9fc3898b795da8960cfce339c2177c82fa3b
Author: Olav Vitters <olav bkor dhs org>
Date:   Thu Jun 11 17:00:27 2009 +0200

    Remove split_lines reference

 git.py                   |    2 +-
 gnome-post-receive-email |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/git.py b/git.py
index b3c7dd8..8e087ab 100644
--- a/git.py
+++ b/git.py
@@ -24,7 +24,7 @@ import re
 from subprocess import Popen, PIPE
 import sys
 
-from util import die, split_lines
+from util import die
 
 # Clone of subprocess.CalledProcessError (not in Python 2.4)
 class CalledProcessError(Exception):
diff --git a/gnome-post-receive-email b/gnome-post-receive-email
index aa7b9c1..d1f7084 100755
--- a/gnome-post-receive-email
+++ b/gnome-post-receive-email
@@ -335,7 +335,9 @@ class BranchChange(RefChange):
                                      oldrev=parent, newrev=commit.id)
 
             email_out.flush()
-            git.show(commit.id, p=True, M=True, stat=True, _outfile=email_out)
+            git.show(commit.id, M=True, stat=True, _outfile=email_out)
+            email_out.flush()
+            git.show(commit.id, p=True, M=True, diff_filter="ACMRTUXB", pretty="format:---", _outfile=email_out)
             end_email()
 
 class BranchCreation(BranchChange):