diff options
| author | Stefan Lay <stefan.lay@sap.com> | 2013-10-22 16:01:18 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-11-05 18:05:03 +0100 |
| commit | cce2561e9fe2ce1cf60182f9d95c8537ce13de92 (patch) | |
| tree | e8da3faa367b665ec03e1811160bceb3c3f1affc /org.eclipse.jgit.test | |
| parent | 765896febb4b63cfe2c37dc0a73c90c79dd1591b (diff) | |
| download | jgit-cce2561e9fe2ce1cf60182f9d95c8537ce13de92.tar.gz jgit-cce2561e9fe2ce1cf60182f9d95c8537ce13de92.zip | |
Add additional RebaseResult for editing commits
With the new RebaseResult.EDIT a client can now distinguish if rebase
stopped due to a conflict or because the commit was marked for edit in
an interactive rebase.
Change-Id: I40f2311cf43ed5f290dcda65a7bd85ba770a85f5
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java index 63ef21d8d3..eb6c5f0a6b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java @@ -1941,7 +1941,7 @@ public class RebaseCommandTest extends RepositoryTestCase { return ""; // not used } }).call(); - assertEquals(Status.STOPPED, res.getStatus()); + assertEquals(Status.EDIT, res.getStatus()); RevCommit toBeEditted = git.log().call().iterator().next(); assertEquals("updated file1 on master", toBeEditted.getFullMessage()); |