Import a patch from a different branch or a commit object into the
current series. By default, the name of the imported patch is used as
-the name of the current patch. It can be overriden with the '--name'
+the name of the current patch. It can be overridden with the '--name'
option. A commit object can be reverted with the '--reverse'
option. The log and author information are those of the commit object."""
raise CmdException, 'No patches applied'
else:
patch_branch = commit_str.split('@')
- if len(patch_branch) == 2:
- patch = patch_branch[0]
- elif options.name:
+ if options.name:
patch = options.name
+ elif len(patch_branch) == 2:
+ patch = patch_branch[0]
else:
- raise CmdException, 'Unkown patch name'
+ raise CmdException, 'Unknown patch name'
commit_id = git_id(commit_str)
commit = git.Commit(commit_id)
print 'Folding commit %s...' % commit_id,
sys.stdout.flush()
- git.merge(bottom, git.get_head(), top)
+ # try a direct git-apply first
+ if not git.apply_diff(bottom, top):
+ git.merge(bottom, git.get_head(), top)
print 'done'
else: