Merge pull request #37 from oldelvet/jenkins-10272

[FIXED JENKINS-10272] Global git config name and email address settings not used.
jenkinsci · Jul 15, 2011 · 421d838 · 421d838
2 parents 7109f29 + 7424a9a
commit 421d838
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -425,27 +425,21 @@ public String getGitConfigEmail() {
     }
 
     public String getGitConfigNameToUse() {
-        String confName;
-        String globalConfigName = ((DescriptorImpl) getDescriptor()).getGlobalConfigName();
-        if ((fixEmptyAndTrim(globalConfigName) != null) && (gitConfigName == null)) {
-            confName = globalConfigName;
-        } else {
-            confName = gitConfigName;
+        String confName = fixEmptyAndTrim(gitConfigName);
+        if (confName == null) {
+        	String globalConfigName = ((DescriptorImpl) getDescriptor()).getGlobalConfigName();
+        	confName = fixEmptyAndTrim(globalConfigName);
         }
-
-        return fixEmptyAndTrim(confName);
+        return confName;
     }
 
     public String getGitConfigEmailToUse() {
-        String confEmail;
-        String globalConfigEmail = ((DescriptorImpl) getDescriptor()).getGlobalConfigEmail();
-        if ((fixEmptyAndTrim(globalConfigEmail) != null) && (gitConfigEmail == null)) {
-            confEmail = globalConfigEmail;
-        } else {
-            confEmail = gitConfigEmail;
+        String confEmail = fixEmptyAndTrim(gitConfigEmail);
+        if (confEmail == null) {
+        	String globalConfigEmail = ((DescriptorImpl) getDescriptor()).getGlobalConfigEmail();
+        	confEmail = fixEmptyAndTrim(globalConfigEmail);
         }
-
-        return fixEmptyAndTrim(confEmail);
+        return confEmail;
     }
 
     public boolean getSkipTag() {