X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/2ac5a14c60a28ff7d68a4d50469c0a111b966bfc..6ef533bcc52fbf933e9f428d8ea2bf690f0ad76a:/stgit/commands/fold.py diff --git a/stgit/commands/fold.py b/stgit/commands/fold.py index 8b796ca..e87ded2 100644 --- a/stgit/commands/fold.py +++ b/stgit/commands/fold.py @@ -71,10 +71,10 @@ def func(parser, options, args): if options.threeway: crt_patch = crt_series.get_patch(current) bottom = crt_patch.get_bottom() - git.apply_patch(filename, bottom) + git.apply_patch(filename = filename, base = bottom) elif options.base: - git.apply_patch(filename, git_id(options.base)) + git.apply_patch(filename = filename, base = git_id(options.base)) else: - git.apply_patch(filename) + git.apply_patch(filename = filename) print 'done'