]> source.dussan.org Git - jgit.git/commit
Do not allow non-ff-rebase if there are uncommitted changes 77/18977/7
authorStefan Lay <stefan.lay@sap.com>
Wed, 27 Nov 2013 10:01:47 +0000 (11:01 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 2 Dec 2013 08:45:15 +0000 (09:45 +0100)
commit591998c2d628ec4f6309caea826fab16a6de2adc
tree18d13e4f745b579ce3c6a4bae9860e18f6fa76a6
parentc95e4fb90959c56411cdbf0e00da481b7285f2dc
Do not allow non-ff-rebase if there are uncommitted changes

With this change jgit checks for uncommitted changes before a rebase is
started. This is also done by native git. One reason is that an abort
would override such changes. The check is skipped for a non-interactive
rebase when it will result in a fast-forward. In this case there can be
only checkout conflicts but no merge conflicts, so there cannot be an
abort which overrides uncommitted changes.

Bug: 422352
Change-Id: I1e0b59b2a4d80a686b67a6729e441924362b1236
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java