]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2bd3556) | patch
Make RepositoryState.REBASING_MERGE reachable again. 32/36832/4
authorLaurent Delaigue <laurent.delaigue@obeo.fr>
Fri, 21 Nov 2014 10:28:19 +0000 (11:28 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 27 Mar 2015 14:58:05 +0000 (15:58 +0100)
commita5c40a38622db55d323084f766f0bf50a5299765
treef8c02bcec61c5d312f2f9290ca901ca0c505cf10tree | snapshot
parent2bd3556e7e1f07c4bb06282ead95a936758e388ecommit | diff
Make RepositoryState.REBASING_MERGE reachable again.

If a non interactive rebase is launched, stopping after a conflict
should set the repository state to RepositoryState.REBASING_MERGE
instead of RepositoryState.REBASING_INTERACTIVE.

Bug: 452623
Change-Id: Ie885aab6d71dabd158a718af0d14fff643c9b850
Also-by: Arthur Daussy <arthur.daussy@obeo.fr>
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit