Don't keep old committer when rewriting a commit

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index a60c5ff..809eabf 100644 (file)
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py
@@ -176,6 +176,7 @@ class StackTransaction(object):
         conflicts to them."""
         i = self.unapplied.index(pn)
         cd = self.patches[pn].data
+        cd = cd.set_committer(None)
         s = ['', ' (empty)'][cd.is_nochange()]
         oldparent = cd.parent
         cd = cd.set_parent(self.__head)