This is useful to pick changes from a non-stgit branch, that were
recorded as a merge commit, while giving control on the parent to
use as "bottom" for the patch (for some reason stgit selects the
first parent by default).
Incidentally, it can be used to pick changes between arbitrary
trees in the revision graph. Since that can be useful as well,
I did not implement the is_parent check I originally meant to add.
Signed-off-by: Yann Dirson <ydirson@altern.org>
make_option('-r', '--reverse',
help = 'reverse the commit object before importing',
action = 'store_true'),
make_option('-r', '--reverse',
help = 'reverse the commit object before importing',
action = 'store_true'),
+ make_option('-p', '--parent', metavar = 'COMMITID',
+ help = 'use COMMITID as parent'),
make_option('--fold',
help = 'fold the commit object into the current patch',
action = 'store_true'),
make_option('--fold',
help = 'fold the commit object into the current patch',
action = 'store_true'),
if not patch:
raise CmdException, 'Unknown patch name'
if not patch:
raise CmdException, 'Unknown patch name'
+ if options.parent:
+ parent = git_id(options.parent)
+ else:
+ parent = commit.get_parent()
+
- bottom = commit.get_parent()
top = commit_id
else:
bottom = commit_id
top = commit_id
else:
bottom = commit_id
- top = commit.get_parent()
if options.fold:
print 'Folding commit %s...' % commit_id,
if options.fold:
print 'Folding commit %s...' % commit_id,