diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-12-02 21:19:10 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-12-02 21:19:10 -0500 |
| commit | 39fe52ccc7db41db5a066663beb2d8428d02c706 (patch) | |
| tree | 17b6ed17abb07330e1d40c4ee4f55afb3da00e4b | |
| parent | b5f9a9b4d33a5a2930957a6ea4a5930ea748b5fd (diff) | |
| parent | 7aa1b85821e007c0243772273960069497284290 (diff) | |
| download | jgit-39fe52ccc7db41db5a066663beb2d8428d02c706.tar.gz jgit-39fe52ccc7db41db5a066663beb2d8428d02c706.zip | |
Merge "Rebase Interoperability first part: write "interactive" file"
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java | 6 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 1 |
2 files changed, 5 insertions, 2 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 2e04cdb1bd..d1d3480b23 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 @@ -322,7 +322,8 @@ public class RebaseCommandTest extends RepositoryTestCase { checkFile(theFile, "<<<<<<< OURS\n1master\n=======\n1topic\n>>>>>>> THEIRS\n2\n3\ntopic4\n"); - assertEquals(RepositoryState.REBASING_MERGE, db.getRepositoryState()); + assertEquals(RepositoryState.REBASING_INTERACTIVE, db + .getRepositoryState()); assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); // the first one should be included, so we should have left two picks in // the file @@ -410,7 +411,8 @@ public class RebaseCommandTest extends RepositoryTestCase { assertEquals(Status.STOPPED, res.getStatus()); assertEquals(conflicting, res.getCurrentCommit()); - assertEquals(RepositoryState.REBASING_MERGE, db.getRepositoryState()); + assertEquals(RepositoryState.REBASING_INTERACTIVE, db + .getRepositoryState()); assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); // the first one should be included, so we should have left two picks in // the file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index f924590417..45c66e57b8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -325,6 +325,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { createFile(rebaseDir, "head", headId.name()); createFile(rebaseDir, "head-name", headName); createFile(rebaseDir, "onto", upstreamCommit.name()); + createFile(rebaseDir, "interactive", ""); BufferedWriter fw = new BufferedWriter(new OutputStreamWriter( new FileOutputStream(new File(rebaseDir, "git-rebase-todo")), "UTF-8")); |