X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/84fcbc3b78f3a0156025d4eb6f6b76df7a5df233..e4fc1f59f679b4f0b5c6805feaf9da0df2cd370f:/stgit/commands/fold.py

diff --git a/stgit/commands/fold.py b/stgit/commands/fold.py
index 963c196..e87ded2 100644
--- a/stgit/commands/fold.py
+++ b/stgit/commands/fold.py
@@ -60,7 +60,10 @@ def func(parser, options, args):
         raise CmdException, 'No patches applied'
 
     if filename:
-        print 'Folding patch "%s"...' % filename,
+        if os.path.exists(filename):
+            print 'Folding patch "%s"...' % filename,
+        else:
+            raise CmdException, 'No such file: %s' % filename
     else:
         print 'Folding patch from stdin...',
     sys.stdout.flush()
@@ -68,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.rev_parse(options.base))
+        git.apply_patch(filename = filename, base = git_id(options.base))
     else:
-        git.apply_patch(filename)
+        git.apply_patch(filename = filename)
 
     print 'done'