diff options
| author | Thomas Wolf <twolf@apache.org> | 2023-04-23 21:31:40 +0200 |
|---|---|---|
| committer | Thomas Wolf <twolf@apache.org> | 2023-04-29 13:24:32 +0200 |
| commit | 8bc13fb79d3ff44f09b67a1effda7155b47391ae (patch) | |
| tree | 494e1ec52f21325470dfa8b71dc4a3cbe1c01f97 /org.eclipse.jgit.ant.test | |
| parent | 3ed4cdda6b99f812258ca50bd77447a28d9d4596 (diff) | |
| download | jgit-8bc13fb79d3ff44f09b67a1effda7155b47391ae.tar.gz jgit-8bc13fb79d3ff44f09b67a1effda7155b47391ae.zip | |
Support cherry-picking a root commit
Handle the case of the commit to be picked not having any parents.
Since JGit implements cherry-pick as a 3-way-merge between the commit
to be picked and the target commit, using the parent of the picked
commit as merge base, this is super simple: just don't set a base tree.
The merger will not find any merge base and will supply an empty tree
iterator for the base.
Bug: 581832
Change-Id: I88985f1b1723db5b35ce58bf228bc48d23d6fca3
Signed-off-by: Thomas Wolf <twolf@apache.org>
Diffstat (limited to 'org.eclipse.jgit.ant.test')
0 files changed, 0 insertions, 0 deletions