diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-12-06 01:09:42 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-12-06 01:09:42 +0100 |
| commit | e3c799dc95f2c5569f8a12f1bb7ec190950e4bdd (patch) | |
| tree | 58155f74f3dcef1161ad60f3d997fa408aa7f19e /org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit | |
| parent | bd57a19fa35b6de493926e2996b28235b96b5690 (diff) | |
| parent | cca2ef12eec44b5b2140761baf13e2a611a654f3 (diff) | |
| download | jgit-e3c799dc95f2c5569f8a12f1bb7ec190950e4bdd.tar.gz jgit-e3c799dc95f2c5569f8a12f1bb7ec190950e4bdd.zip | |
Merge branch 'stable-7.1'
* stable-7.1:
FileSnapshot: silence "Not a Directory" exceptions
FileSnapshot: refactor to share error handling
Mark Attribute#getValue as @Nullable
Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategy
Fix NPE in DiffFormatter#getDiffDriver
Pack: ensure packfile is still valid while still recoverable
WindowCache: add bulk purge(), call from bulk sites
UploadPack#implies: add missing @since tag
Disable MergeToolTest#testEmptyToolName
Change-Id: Ifa8df2b9e6e4ee371113b7114fe20b42333e3718
Diffstat (limited to 'org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java index 65c7e9a88c..6339831a40 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java @@ -27,6 +27,7 @@ import org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool; import org.eclipse.jgit.internal.diffmergetool.MergeTools; import org.eclipse.jgit.lib.StoredConfig; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** @@ -77,6 +78,7 @@ public class MergeToolTest extends ToolTestCase { + errorReturnCode); } + @Ignore @Test public void testEmptyToolName() throws Exception { assumeLinuxPlatform(); |