[StGit PATCH 07/13] Clean up Series.refresh_patch
From: David Kågedal <hidden>
Date: 2016-06-15 22:43:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
This patch does some minor simplifications of the code and updates the documentation string of Series.refresh_patch. Signed-off-by: David Kågedal <redacted> --- stgit/stack.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index 9b8ed6e..03ce218 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py@@ -749,14 +749,12 @@ class Series(PatchSet): committer_name = None, committer_email = None, backup = False, sign_str = None, log = 'refresh', notes = None): - """Generates a new commit for the given patch + """Generates a new commit for the topmost patch """ - name = self.get_current() - if not name: + patch = self.get_current_patch() + if not patch: raise StackException, 'No patches applied' - patch = self.get_patch(name) - descr = patch.get_description() if not (message or descr): edit = True
@@ -767,7 +765,7 @@ class Series(PatchSet): if not message and edit: descr = edit_file(self, descr.rstrip(), \ 'Please edit the description for patch "%s" ' \ - 'above.' % name, show_patch) + 'above.' % patch.get_name(), show_patch) if not author_name: author_name = patch.get_authname()