diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-05-02 15:16:45 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-05-02 15:23:55 +0200 |
| commit | acbb197355bc1ce3d2be747e3af62a01ca6821e5 (patch) | |
| tree | d90b6be67723c00db1e85251eb91410bb10c8e62 /org.eclipse.jgit.pgm.test | |
| parent | c8844571b3a483e3cc5f77d18b4e972ad5fe2c5e (diff) | |
| parent | 98f329e93791a49068adc0bc2f5c81234fe2d943 (diff) | |
| download | jgit-acbb197355bc1ce3d2be747e3af62a01ca6821e5.tar.gz jgit-acbb197355bc1ce3d2be747e3af62a01ca6821e5.zip | |
Merge branch 'master' into next
* master:
Bazel: Add support for JDK 21
Bazel: Replace deprecated --experimental_strict_action_env option
Fix warning about using raw type
[errorprone] Fix pattern ModifiedButNotUsed
[errorprone] Fix pattern CatchAndPrintStackTrace
[errorprone] Fix pattern FutureReturnValueIgnored
[errorprone] Fix pattern BadImport
[errorprone] Fix pattern UseCorrectAssertInTests
[errorprone] Fix pattern ProtectedMembersInFinalClass
[errorprone] Fix pattern CatchFail
[errorprone] Fix pattern see UnusedVariable
[errorprone] Fix pattern LongLiteralLowerCaseSuffix
[errorprone] Fix error pattern JdkObsolete
[errorprone] Fix UnnecessaryParentheses errors
Bazel: Update RBE docker image to Ubuntu 22.04 and JDK 17
Bump Bazel version to 7.1.1
PackIndex: Make #getOffset protected to allow out-of-package subclasses
Change-Id: I4ecde5e6a3cb9f122990893fa97f6d2a9978bcc4
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java index cbb5bbb9cc..a1fb9fb589 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java @@ -183,7 +183,7 @@ public class CloneTest extends CLIRepositoryTestCase { File gitDir = db.getDirectory(); String sourcePath = gitDir.getAbsolutePath(); - String targetPath = (new File(sourcePath)).getParentFile() + String targetPath = new File(sourcePath).getParentFile() .getParentFile().getAbsolutePath() + File.separator + "target.git"; String cmd = "git clone --bare " + shellQuote(sourcePath) + " " @@ -207,7 +207,7 @@ public class CloneTest extends CLIRepositoryTestCase { File gitDir = db.getDirectory(); String sourcePath = gitDir.getAbsolutePath(); - String targetPath = (new File(sourcePath)).getParentFile() + String targetPath = new File(sourcePath).getParentFile() .getParentFile().getAbsolutePath() + File.separator + "target.git"; String cmd = "git clone --mirror " + shellQuote(sourcePath) + " " diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java index 005215f443..0af310c497 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java @@ -45,10 +45,9 @@ public class ConfigTest extends CLIRepositoryTestCase { Map<String, String> options = parseOptions(output); assertEquals(!isWindows, Boolean.valueOf(options.get("core.filemode"))); - assertTrue((Boolean.valueOf(options.get("core.logallrefupdates")))); + assertTrue(Boolean.valueOf(options.get("core.logallrefupdates"))); if (isMac) { - assertTrue( - (Boolean.valueOf(options.get("core.precomposeunicode")))); + assertTrue(Boolean.valueOf(options.get("core.precomposeunicode"))); } assertEquals(Integer.valueOf(0), Integer.valueOf(options.get("core.repositoryformatversion"))); |