[StGit PATCH 4/5] Add the -p option to fold
From: Catalin Marinas <hidden>
Date: 2016-06-15 22:47:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
This option was added to import, so it makes sense for fold to have it as well. Signed-off-by: Catalin Marinas <redacted> --- stgit/commands/fold.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/stgit/commands/fold.py b/stgit/commands/fold.py
index 28e824c..ce0459e 100644
--- a/stgit/commands/fold.py
+++ b/stgit/commands/fold.py@@ -39,6 +39,8 @@ options = [ short = 'Perform a three-way merge with the current patch'), opt('-b', '--base', args = [argparse.commit], short = 'Use BASE instead of HEAD when applying the patch'), + opt('-p', '--strip', type = 'int', metavar = 'N', + short = 'Remove N leading slashes from diff paths (default 1)'), opt('--reject', action = 'store_true', short = 'Leave the rejected hunks in corresponding *.rej files')]
@@ -75,11 +77,13 @@ def func(parser, options, args): crt_patch = crt_series.get_patch(current) bottom = crt_patch.get_bottom() git.apply_patch(filename = filename, base = bottom, - reject = options.reject) + strip = options.strip, reject = options.reject) elif options.base: git.apply_patch(filename = filename, reject = options.reject, + strip = options.strip, base = git_id(crt_series, options.base)) else: - git.apply_patch(filename = filename, reject = options.reject) + git.apply_patch(filename = filename, strip = options.strip, + reject = options.reject) out.done()