action = 'store_true'),
make_option('-n', '--name',
help = 'use NAME as the patch name'),
- make_option('--base',
+ make_option('-b', '--base',
help = 'use BASE instead of HEAD for file importing'),
make_option('-e', '--edit',
help = 'invoke an editor for the patch description',
sys.stdout.flush()
if options.base:
- orig_head = git.get_head()
- git.switch(options.base)
-
- try:
- git.apply_patch(filename)
- except git.GitException, ex:
- print >> sys.stderr, '"git apply" failed'
- git.switch(orig_head)
- raise
-
- top = crt_series.refresh_patch(commit_only = True)
- git.switch(orig_head)
- git.merge(options.base, orig_head, top)
+ git.apply_patch(filename, git_id(options.base))
else:
git.apply_patch(filename)