]> source.dussan.org Git - jgit.git/commit
RebaseCommand: fix ONTO_NAME, and --preserve-merges is interactive 38/137338/3
authorThomas Wolf <thomas.wolf@paranor.ch>
Wed, 19 Dec 2018 10:03:29 +0000 (11:03 +0100)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Tue, 26 Feb 2019 07:18:27 +0000 (16:18 +0900)
commita64fa0bd7f0f958ccd87b0cd5e7c1bd39500c636
tree09dc37884bca8de9c611a88819dc7fcb29e9c6cd
parent60cf85a4a39c34a426e52c4f1fa3f5ef5ba659c5
RebaseCommand: fix ONTO_NAME, and --preserve-merges is interactive

ONTO_NAME must be "onto_name", not "onto-name".

For native git, --preserve-merges is an interactive mode. Create the
INTERACTIVE marker file, otherwise a native git rebase --continue
will fall back into rebase --merge mode before git 2.19.0 since it
started looking for the REWRITTEN directory to make the distinction
only then.[1]

This allows a JGit interactive rebase to be continued via native git
rebase --continue.

[1] https://github.com/git/git/commit/6d98d0c0

Bug: 511487
Change-Id: I13850e0fd96ac77d03fbb581c8790d76648dbbc6
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java