diff options
| author | Andre Bossert <andre.bossert@siemens.com> | 2020-01-21 10:13:43 +0100 |
|---|---|---|
| committer | Andrey Loskutov <loskutov@gmx.de> | 2022-06-02 10:36:39 +0200 |
| commit | c32694e5ae98e5c1373afcb535a76d37e5d82a29 (patch) | |
| tree | 3bdd7ef80eccd0177a80b79d8c50d3968046d6ec /org.eclipse.jgit.pgm.test | |
| parent | ff77d412a9f1a956b8d76b139489038ee3b0870c (diff) | |
| download | jgit-c32694e5ae98e5c1373afcb535a76d37e5d82a29.tar.gz jgit-c32694e5ae98e5c1373afcb535a76d37e5d82a29.zip | |
Teach JGit to handle external diff/merge tools defined in .gitattributes
Adds API that allows UI to find (and handle) diff/merge tools, specific
for the given path. The assumption is that user can specify file type
specific diff/merge tools via gitattributes.
Bug: 552840
Change-Id: I1daa091e9afa542a9ebb5417853dff0452ed52dd
Signed-off-by: Mykola Zakharchuk <zakharchuk.vn@gmail.com>
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java index ce4c004c09..2b50d45253 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java @@ -79,7 +79,7 @@ public class DiffToolTest extends ToolTestCase { + errorReturnCode); } - @Test + @Test(expected = Die.class) public void testEmptyToolName() throws Exception { String emptyToolName = ""; @@ -95,6 +95,7 @@ public class DiffToolTest extends ToolTestCase { String[] expectedErrorOutput = { araxisErrorLine, araxisErrorLine, }; runAndCaptureUsingInitRaw(Arrays.asList(expectedErrorOutput), DIFF_TOOL, "--no-prompt"); + fail("Expected exception to be thrown due to external tool exiting with an error"); } @Test |