Merge pull request #3954 from MarkEWaite/safeguard-mergeTests-from-incorrect-config-operation

Only configure the gpgsigning if the repository exists

Author: MarkEWaite

src/test/java/hudson/plugins/git/AbstractGitTestCase.java

@@ -251,12 +251,12 @@ protected FreeStyleProject setupSimpleProject(String branchString) throws Except
 
     protected FreeStyleBuild build(final FreeStyleProject project, final Result expectedResult, final String...expectedNewlyCommittedFiles) throws Exception {
         final FreeStyleBuild build = project.scheduleBuild2(0).get();
-        for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
-            assertTrue(build.getWorkspace().child(expectedNewlyCommittedFile).exists(), expectedNewlyCommittedFile + " file not found in workspace");
-        }
         if(expectedResult != null) {
             r.assertBuildStatus(expectedResult, build);
         }
+        for(final String expectedNewlyCommittedFile : expectedNewlyCommittedFiles) {
+            assertTrue(build.getWorkspace().child(expectedNewlyCommittedFile).exists(), expectedNewlyCommittedFile + " file not found in workspace");
+        }
         return build;
     }
 

src/test/java/hudson/plugins/git/GitSCMSlowTest.java

@@ -334,8 +334,11 @@ public TestPreBuildMerge(UserMergeOptions options) {
         @Override
         public GitClient decorate(GitSCM scm, GitClient git) throws IOException, InterruptedException, GitException {
             GitClient gitClient = super.decorate(scm, git);
-            gitClient.config(GitClient.ConfigLevel.LOCAL, "commit.gpgsign", "false");
-            gitClient.config(GitClient.ConfigLevel.LOCAL, "tag.gpgSign", "false");
+            if (gitClient.hasGitRepo()) {
+                // Do not attempt to disable GPG signing unless we're in a repository
+                gitClient.config(GitClient.ConfigLevel.LOCAL, "commit.gpgsign", "false");
+                gitClient.config(GitClient.ConfigLevel.LOCAL, "tag.gpgSign", "false");
+            }
             return gitClient;
         }
     }