From 9b822768636315d9ca36eda71dd0fbdcbb3793dc Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 11 Dec 2021 12:11:16 -0700 Subject: [PATCH 1/6] Ignore VSCode working files --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e7e1a8903e..c6cfd9e6b2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ target/ work/ .@tmp/ +.vs/ +.vscode/ .project .classpath @@ -25,4 +27,4 @@ tags /nbproject/ # Mac OSX -.DS_Store \ No newline at end of file +.DS_Store From 136785a2575fef301b8e3edd070d813c3a64734a Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 11 Dec 2021 12:46:23 -0700 Subject: [PATCH 2/6] Log GitTool redundant initialization --- src/main/java/hudson/plugins/git/GitTool.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/hudson/plugins/git/GitTool.java b/src/main/java/hudson/plugins/git/GitTool.java index eb6609379e..f96424cbd8 100644 --- a/src/main/java/hudson/plugins/git/GitTool.java +++ b/src/main/java/hudson/plugins/git/GitTool.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.logging.Level; import java.util.logging.Logger; import static hudson.init.InitMilestone.EXTENSIONS_AUGMENTED; @@ -124,6 +125,7 @@ public static void onLoaded() { GitTool[] installations = getInstallations(descriptor); if (installations != null && installations.length > 0) { + LOGGER.log(Level.FINEST, "Already initialized GitTool, no need to initialize again"); //No need to initialize if there's already something return; } From cfc7969d94ff5ba0ab22e3955000303f44e12c1c Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 11 Dec 2021 13:08:20 -0700 Subject: [PATCH 3/6] Use spotless to remove unused imports Also assures each file ends with a newline --- .../plugins/gitclient/LegacyCompatibleGitAPIImplTest.java | 4 ---- src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java | 1 - 2 files changed, 5 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java index d947427df0..ae7a78eee6 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java @@ -1,13 +1,11 @@ package org.jenkinsci.plugins.gitclient; -import hudson.Launcher; import hudson.model.TaskListener; import hudson.plugins.git.GitException; import hudson.plugins.git.IndexEntry; import hudson.plugins.git.Revision; import hudson.plugins.git.Tag; import hudson.util.StreamTaskListener; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; @@ -16,12 +14,10 @@ import java.util.List; import java.util.UUID; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.transport.RemoteConfig; -import org.eclipse.jgit.transport.URIish; import static org.junit.Assert.*; import org.junit.Before; import org.junit.BeforeClass; diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java index 0a45671989..cf3a5e9d2b 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java @@ -17,7 +17,6 @@ import org.apache.commons.io.FileUtils; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.URIish; import org.junit.After; From c556a36d4f094b8ef45b53860a1abc2b6b22b51c Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 11 Dec 2021 13:08:52 -0700 Subject: [PATCH 4/6] Remove unused variables in tests --- .../LegacyCompatibleGitAPIImplTest.java | 38 +++---------------- .../jenkinsci/plugins/gitclient/PushTest.java | 1 - .../plugins/gitclient/RemoteGitImplTest.java | 2 - .../trilead/CredentialsProviderImplTest.java | 1 - 4 files changed, 5 insertions(+), 37 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java index ae7a78eee6..5aacc12caa 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java @@ -97,33 +97,6 @@ private File touch(String path, String content) throws IOException { return f; } - private String cmd(boolean ignoreError, String... args) throws IOException, InterruptedException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - int st = new Launcher.LocalLauncher(listener).launch().pwd(repo).cmds(args). - envs(env).stdout(out).join(); - String s = out.toString(); - if (!ignoreError) { - if (s == null || s.isEmpty()) { - s = StringUtils.join(args, ' '); - } - assertEquals(s, 0, st); /* Reports full output of failing commands */ - - } - return s; - } - - private String log() throws IOException, InterruptedException { - return cmd(false, "git", "log", "-n", "3"); - } - - private String log(ObjectId rev) throws IOException, InterruptedException { - return cmd(false, "git", "log", "-n", "3", rev.name()); - } - - private String contentOf(File file) throws IOException { - return FileUtils.readFileToString(file, "UTF-8"); - } - @Test @Deprecated public void testCloneRemoteConfig() throws URISyntaxException, InterruptedException, IOException, ConfigInvalidException { @@ -139,7 +112,6 @@ public void testCloneRemoteConfig() throws URISyntaxException, InterruptedExcept + "fetch = +refs/heads/*:refs/remotes/" + remoteName + "/*\n"; config.fromText(configText); RemoteConfig remoteConfig = new RemoteConfig(config, remoteName); - List list = remoteConfig.getURIs(); git.clone(remoteConfig); File[] files = git.workspace.listFiles(); assertEquals(files.length + "files in " + Arrays.toString(files), 1, files.length); @@ -172,14 +144,14 @@ private File commitTrackedFile() throws IOException, GitException, InterruptedEx @Test @Deprecated public void testShowRevisionThrowsGitException() throws Exception { - File trackedFile = commitTrackedFile(); + commitTrackedFile(); assertThrows(GitException.class, () -> git.showRevision(new Revision(gitClientCommit))); } @Test @Deprecated public void testShowRevisionTrackedFile() throws Exception { - File trackedFile = commitTrackedFile(); + commitTrackedFile(); ObjectId head = git.getHeadRev(repo.getPath(), defaultBranchName); List revisions = git.showRevision(new Revision(head)); assertEquals("commit " + head.name(), revisions.get(0)); @@ -195,7 +167,7 @@ public void testGetTagsOnCommit_empty() throws Exception { @Test @Deprecated public void testGetTagsOnCommit_non_empty() throws Exception { - File trackedFile = commitTrackedFile(); + commitTrackedFile(); List result = git.getTagsOnCommit(taggedCommit.name()); assertTrue("Tag list not empty: " + result, result.isEmpty()); } @@ -212,7 +184,7 @@ public void testGetTagsOnCommit_SHA1() throws Exception { @Deprecated public void testGetTagsOnCommit() throws Exception { LegacyCompatibleGitAPIImpl myGit = (LegacyCompatibleGitAPIImpl) Git.with(listener, env).in(repo).using(gitImpl).getClient(); - File trackedFile = commitTrackedFile(); + commitTrackedFile(); final String uniqueTagName = "testGetTagsOnCommit-" + UUID.randomUUID(); final String tagMessage = "Tagged with " + uniqueTagName; myGit.tag(uniqueTagName, tagMessage); @@ -240,7 +212,7 @@ public void testLsTreeThrows() { @Test public void testLsTreeOneCommit() throws Exception { - File trackedFile = commitTrackedFile(); + commitTrackedFile(); List lsTree = git.lsTree("HEAD"); assertEquals("lsTree wrong size - " + lsTree, 1, lsTree.size()); assertEquals("tracked-file", lsTree.get(0).getFile()); diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java index cf3a5e9d2b..1efe954023 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java @@ -153,7 +153,6 @@ public static Collection pushParameters() { public void createWorkingRepository() throws IOException, InterruptedException { hudson.EnvVars env = new hudson.EnvVars(); TaskListener listener = StreamTaskListener.fromStderr(); - List refSpecs = new ArrayList<>(); workingRepo = temporaryFolder.newFolder(); workingGitClient = Git.with(listener, env).in(workingRepo).using(gitImpl).getClient(); workingGitClient.clone_() diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/RemoteGitImplTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/RemoteGitImplTest.java index d4d658aef0..e981ac2d13 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/RemoteGitImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/RemoteGitImplTest.java @@ -98,7 +98,6 @@ public void testAddCredentials() { public void testSetCredentials() { CredentialsScope scope = CredentialsScope.GLOBAL; String password = "password"; - String url = "https://github.com/jenkinsci/git-client-plugin"; String username = "user"; String id = "username-" + username + "-password-" + password + "-" + random.nextInt(); StandardUsernameCredentials credentials = new UsernamePasswordCredentialsImpl(scope, username, password, id, "Credential description"); @@ -109,7 +108,6 @@ public void testSetCredentials() { public void testAddDefaultCredentials() { CredentialsScope scope = CredentialsScope.GLOBAL; String password = "password"; - String url = "https://github.com/jenkinsci/git-client-plugin"; String username = "user"; String id = "username-" + username + "-password-" + password + "-" + random.nextInt(); StandardCredentials credentials = new UsernamePasswordCredentialsImpl(scope, username, password, id, "Credential description"); diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImplTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImplTest.java index d97ff2f3df..8648bc2a10 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/trilead/CredentialsProviderImplTest.java @@ -95,7 +95,6 @@ public void testThrowsUnsupportedOperationException() { @Test public void testSupportsDisallowed() { - Secret secret = Secret.fromString(SECRET_VALUE); listener = StreamTaskListener.fromStdout(); StandardUsernameCredentials badCred = new MyUsernameCredentialsImpl(USER_NAME); CredentialsProviderImpl badProvider = new CredentialsProviderImpl(listener, badCred); From 5ee2c466aa0561eea6b2ec0457e07379dae640dd Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 11 Dec 2021 13:09:29 -0700 Subject: [PATCH 5/6] Return a typed collection in test --- .../java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java | 2 +- .../java/org/jenkinsci/plugins/gitclient/PushSimpleTest.java | 2 +- src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java | 2 +- .../jenkinsci/plugins/gitclient/SubmodulePatternStringTest.java | 2 +- .../org/jenkinsci/plugins/gitclient/WarnTempDirValueTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java index 27ca63eab7..b712414366 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java @@ -180,7 +180,7 @@ private void createConflictingCommit() throws Exception { } @Parameterized.Parameters(name = "{0}") - public static Collection gitImplementations() { + public static Collection gitImplementations() { List args = new ArrayList<>(); String[] implementations = new String[]{"git", "jgit"}; for (String implementation : implementations) { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/PushSimpleTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/PushSimpleTest.java index fec72d08ae..b75764b742 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/PushSimpleTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/PushSimpleTest.java @@ -34,7 +34,7 @@ public void pushBadURIThrows() throws IOException, GitException, InterruptedExce } @Parameterized.Parameters(name = "{0} with {1}") - public static Collection pushParameters() { + public static Collection pushParameters() { List parameters = new ArrayList<>(); Object[] gitParameter = {"git", "master", "master", null}; parameters.add(gitParameter); diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java index 1efe954023..3f1de6a3b4 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/PushTest.java @@ -109,7 +109,7 @@ public void pushNonFastForwardForce() throws IOException, GitException, Interrup } @Parameterized.Parameters(name = "{0} with {1} refspec {2}") - public static Collection pushParameters() { + public static Collection pushParameters() { List parameters = new ArrayList<>(); final String[] implementations = {"git", "jgit"}; final String[] goodRefSpecs = { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/SubmodulePatternStringTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/SubmodulePatternStringTest.java index 65e0c3cd2c..9ba773a0b9 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/SubmodulePatternStringTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/SubmodulePatternStringTest.java @@ -36,7 +36,7 @@ public SubmodulePatternStringTest(String repoUrl, String remoteName) * Tests file, ssh (both forms), git, and https. */ @Parameterized.Parameters(name = "{0}-{1}") - public static Collection repoAndRemote() { + public static Collection repoAndRemote() { List arguments = new ArrayList<>(); String[] repoUrls = { "file://gitroot/thirdparty.url.repo", diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/WarnTempDirValueTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/WarnTempDirValueTest.java index 35b5fa16dc..fbb02d095f 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/WarnTempDirValueTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/WarnTempDirValueTest.java @@ -73,7 +73,7 @@ public void checkLogger() { } @Parameterized.Parameters(name = "{0}") - public static Collection envVarsToCheck() { + public static Collection envVarsToCheck() { List envVarNames = new ArrayList<>(); Object[] tmp = {"TMP"}; envVarNames.add(tmp); From b5bc11554be23ec9e2a40fbfbb5c11dcee3cde34 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 24 Dec 2021 04:57:58 -0700 Subject: [PATCH 6/6] [JENKINS-67362] Test with init.defaultBranch value Previous technique was only checking for the setting at global level for the user and was ignoring system level configuration. Git for Windows provides an installation option that configures it at the system level. If the defaultBranch name is set at any level, honor that setting. --- .../org/jenkinsci/plugins/gitclient/FilePermissionsTest.java | 2 +- src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java | 2 +- .../java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java | 2 +- .../org/jenkinsci/plugins/gitclient/GitClientFetchTest.java | 2 +- .../java/org/jenkinsci/plugins/gitclient/GitClientTest.java | 2 +- .../plugins/gitclient/LegacyCompatibleGitAPIImplTest.java | 2 +- .../java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/FilePermissionsTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/FilePermissionsTest.java index 1a074a9ab1..8e904ad60e 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/FilePermissionsTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/FilePermissionsTest.java @@ -65,7 +65,7 @@ public static void createTestRepo() throws IOException, InterruptedException { public static void computeDefaultBranchName() throws Exception { File configDir = Files.createTempDirectory("readGitConfig").toFile(); CliGitCommand getDefaultBranchNameCmd = new CliGitCommand(Git.with(TaskListener.NULL, new hudson.EnvVars()).in(configDir).using("git").getClient()); - String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--global", "--get", "init.defaultBranch"); + String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--get", "init.defaultBranch"); for (String s : output) { String result = s.trim(); if (result != null && !result.isEmpty()) { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java b/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java index 1764694352..602fe7f018 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java @@ -136,7 +136,7 @@ public static void loadLocalMirror() throws Exception { public static void computeDefaultBranchName() throws Exception { File configDir = Files.createTempDirectory("readGitConfig").toFile(); CliGitCommand getDefaultBranchNameCmd = new CliGitCommand(Git.with(TaskListener.NULL, new hudson.EnvVars()).in(configDir).using("git").getClient()); - String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--global", "--get", "init.defaultBranch"); + String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--get", "init.defaultBranch"); for (String s : output) { String result = s.trim(); if (result != null && !result.isEmpty()) { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java b/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java index 197318d5b8..f92edd3933 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java @@ -408,7 +408,7 @@ private String getDefaultBranchName() throws Exception { String defaultBranchValue = "mast" + "er"; // Intentionally split to note this will remain File configDir = Files.createTempDirectory("readGitConfig").toFile(); CliGitCommand getDefaultBranchNameCmd = new CliGitCommand(Git.with(TaskListener.NULL, env).in(configDir).using("git").getClient()); - String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--global", "--get", "init.defaultBranch"); + String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--get", "init.defaultBranch"); for (String s : output) { String result = s.trim(); if (result != null && !result.isEmpty()) { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/GitClientFetchTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/GitClientFetchTest.java index d2b3a99a0b..59f103e6f4 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/GitClientFetchTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/GitClientFetchTest.java @@ -91,7 +91,7 @@ public GitClientFetchTest(final String gitImplName) { public static void computeDefaultBranchName() throws Exception { File configDir = Files.createTempDirectory("readGitConfig").toFile(); CliGitCommand getDefaultBranchNameCmd = new CliGitCommand(Git.with(TaskListener.NULL, new hudson.EnvVars()).in(configDir).using("git").getClient()); - String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--global", "--get", "init.defaultBranch"); + String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--get", "init.defaultBranch"); for (String s : output) { String result = s.trim(); if (result != null && !result.isEmpty()) { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java index b99fbe9039..0d2bbd6547 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java @@ -224,7 +224,7 @@ public static void mirrorUpstreamRepositoryLocally() throws Exception { public static void computeDefaultBranchName() throws Exception { File configDir = Files.createTempDirectory("readGitConfig").toFile(); CliGitCommand getDefaultBranchNameCmd = new CliGitCommand(Git.with(TaskListener.NULL, new EnvVars()).in(configDir).using("git").getClient()); - String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--global", "--get", "init.defaultBranch"); + String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--get", "init.defaultBranch"); for (String s : output) { String result = s.trim(); if (result != null && !result.isEmpty()) { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java index 5aacc12caa..97bddde5c2 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java @@ -56,7 +56,7 @@ public LegacyCompatibleGitAPIImplTest() { public static void computeDefaultBranchName() throws Exception { File configDir = Files.createTempDirectory("readGitConfig").toFile(); CliGitCommand getDefaultBranchNameCmd = new CliGitCommand(Git.with(TaskListener.NULL, new hudson.EnvVars()).in(configDir).using("git").getClient()); - String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--global", "--get", "init.defaultBranch"); + String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--get", "init.defaultBranch"); for (String s : output) { String result = s.trim(); if (result != null && !result.isEmpty()) { diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java index b712414366..ec2c7de80c 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java @@ -67,7 +67,7 @@ public MergeCommandTest(String implementation) { public static void computeDefaultBranchName() throws Exception { File configDir = java.nio.file.Files.createTempDirectory("readGitConfig").toFile(); CliGitCommand getDefaultBranchNameCmd = new CliGitCommand(Git.with(TaskListener.NULL, new hudson.EnvVars()).in(configDir).using("git").getClient()); - String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--global", "--get", "init.defaultBranch"); + String[] output = getDefaultBranchNameCmd.runWithoutAssert("config", "--get", "init.defaultBranch"); for (String s : output) { String result = s.trim(); if (result != null && !result.isEmpty()) {