diff options
author | Catalin Marinas <catalin.marinas@gmail.com> | 2009-09-16 14:13:13 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@gmail.com> | 2009-09-16 14:13:13 +0100 |
commit | ca5c965190e993a10289758e7cbdc5b9c9f9c31e (patch) | |
tree | 8f41cf2c1b93bbe330d4aa2d3ee32ef5bcaee1ec | |
parent | 46cc10370c2dc63640fbd5dbefd9fdf921488098 (diff) | |
download | stgit-ca5c965190e993a10289758e7cbdc5b9c9f9c31e.tar.gz |
Add the -p option to fold
This option was added to import, so it makes sense for fold to have it
as well.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
-rw-r--r-- | 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() |