summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test/src
diff options
context:
space:
mode:
authorTomasz Zarna <tomasz.zarna@tasktop.com>2012-01-12 18:32:53 +0100
committerTomasz Zarna <tomasz.zarna@tasktop.com>2013-04-04 15:11:49 +0200
commit545358577376bec8fc140a76ce0f72bf81cc0a94 (patch)
tree410629280cc5f6a62a09334b0a28937214539928 /org.eclipse.jgit.pgm.test/src
parent81b601de53125bbcd30620b58168154d7541d8ad (diff)
downloadjgit-545358577376bec8fc140a76ce0f72bf81cc0a94.tar.gz
jgit-545358577376bec8fc140a76ce0f72bf81cc0a94.zip
Add the no-commit option to MergeCommand
Added also tests and the associated option for the command line Merge command. Bug: 335091 Change-Id: Ie321c572284a6f64765a81674089fc408a10d059 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test/src')
-rw-r--r--org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java
index 755174bcbc..a328baec27 100644
--- a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java
+++ b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/lib/CLIRepositoryTestCase.java
@@ -49,7 +49,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.junit.JGitTestUtil;
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
import org.eclipse.jgit.pgm.CLIGitCommand;
@@ -57,7 +56,7 @@ import org.junit.Before;
public class CLIRepositoryTestCase extends LocalDiskRepositoryTestCase {
/** Test repository, initialized for this test case. */
- protected FileRepository db;
+ protected Repository db;
/** Working directory of {@link #db}. */
protected File trash;
@@ -165,7 +164,7 @@ public class CLIRepositoryTestCase extends LocalDiskRepositoryTestCase {
assertEquals(toText(expected), toText(actual));
}
- private String toText(String[] lines) {
+ private static String toText(String[] lines) {
StringBuilder b = new StringBuilder();
for (String s : lines) {
b.append(s);