diff options
| author | Thomas Wolf <twolf@apache.org> | 2024-01-10 18:36:50 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-28 20:40:20 +0100 |
| commit | 906c2bebed0dc732a2fbd5b397466cf3522714f0 (patch) | |
| tree | fa51e9267a6df563ff685c80dc0eeefcb19f6036 /org.eclipse.jgit.pgm.test | |
| parent | c701c01b49d92993f1c3df0a0e26a2dd68b8cec1 (diff) | |
| download | jgit-906c2bebed0dc732a2fbd5b397466cf3522714f0.tar.gz jgit-906c2bebed0dc732a2fbd5b397466cf3522714f0.zip | |
RebaseCommand: fix stopping on root commit conflicts
If rebasing runs into a conflict when applying a root commit from an
independent branch, there is no parent commit. Write an empty patch
file in that case like C git does.
Bug: jgit-6
Change-Id: I315313673d2abf29639d7d96c958d599961ba276
Signed-off-by: Thomas Wolf <twolf@apache.org>
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
0 files changed, 0 insertions, 0 deletions