From: Pavel Roskin Date: Fri, 31 Aug 2007 03:04:55 GMT Subject: [PATCH 2/2] Fix refresh -es Message-ID: <20070831030455.22554.75625.stgit@dv.roinet.com> In-Reply-To: <20070831030449.22554.49699.stgit@dv.roinet.com> Use named arguments to call git.diff() from stack.edit_file(). git.diff() doesn't write to files anymore, do it in the caller. Signed-off-by: Pavel Roskin --- stgit/stack.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/stgit/stack.py b/stgit/stack.py index ea22d76..0253348 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -88,7 +88,8 @@ def edit_file(series, line, comment, show_patch = True): if show_patch: print >> f, __patch_prefix # series.get_patch(series.get_current()).get_top() - git.diff([], series.get_patch(series.get_current()).get_bottom(), None, f) + diff_str = git.diff(rev1 = series.get_patch(series.get_current()).get_bottom()) + f.write(diff_str) #Vim modeline must be near the end. print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'