[StGit PATCH] If a patch is not changed when pushing, reuse the same commit object
From: Karl Hasselström <hidden>
Date: 2016-06-15 22:44:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
It should be marginally faster since we don't have to create a new commit object, but mostly it's a cleanliness issue: rewriting history when we don't have to is bad. Signed-off-by: Karl Hasselström <redacted> --- stgit/lib/transaction.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index 2946a67..9a23c01 100644
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py@@ -175,8 +175,8 @@ class StackTransaction(object): """Attempt to push the named patch. If this results in conflicts, halts the transaction. If index+worktree are given, spill any conflicts to them.""" - cd = self.patches[pn].data - cd = cd.set_committer(None) + orig_cd = self.patches[pn].data + cd = orig_cd.set_committer(None) s = ['', ' (empty)'][cd.is_nochange()] oldparent = cd.parent cd = cd.set_parent(self.__head)
@@ -204,7 +204,11 @@ class StackTransaction(object): except git.MergeException, e: self.__halt(str(e)) cd = cd.set_tree(tree) - self.patches[pn] = self.__stack.repository.commit(cd) + if any(getattr(cd, a) != getattr(orig_cd, a) for a in + ['parent', 'tree', 'author', 'message']): + self.patches[pn] = self.__stack.repository.commit(cd) + else: + s = ' (unmodified)' del self.unapplied[self.unapplied.index(pn)] self.applied.append(pn) out.info('Pushed %s%s' % (pn, s))