Merge pull request #44 from tjormola/fix-passing-env-vars

Always set git name and email environment variables
jenkinsci · Oct 25, 2011 · 79c9c8d · 79c9c8d
2 parents ae23c65 + dc96d35
commit 79c9c8d
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -944,20 +944,7 @@ public boolean checkout(final AbstractBuild build, Launcher launcher,
             listener.getLogger().println("Last Built Revision: " + buildData.lastBuild.revision);
         }
 
-        EnvVars tempEnvironment = build.getEnvironment(listener);
-
-        String confName = getGitConfigNameToUse();
-        if ((confName != null) && (!confName.equals(""))) {
-            tempEnvironment.put("GIT_COMMITTER_NAME", confName);
-            tempEnvironment.put("GIT_AUTHOR_NAME", confName);
-        }
-        String confEmail = getGitConfigEmailToUse();
-        if ((confEmail != null) && (!confEmail.equals(""))) {
-            tempEnvironment.put("GIT_COMMITTER_EMAIL", confEmail);
-            tempEnvironment.put("GIT_AUTHOR_EMAIL", confEmail);
-        }
-
-        final EnvVars environment = tempEnvironment;
+        final EnvVars environment = build.getEnvironment(listener);
 
         final String singleBranch = getSingleBranch(build);
         final String paramLocalBranch = getParamLocalBranch(build);
@@ -1321,6 +1308,17 @@ public void buildEnvVars(AbstractBuild<?, ?> build, java.util.Map<String, String
             }
         }
 
+        String confName = getGitConfigNameToUse();
+        if ((confName != null) && (!confName.equals(""))) {
+            env.put("GIT_COMMITTER_NAME", confName);
+            env.put("GIT_AUTHOR_NAME", confName);
+        }
+        String confEmail = getGitConfigEmailToUse();
+        if ((confEmail != null) && (!confEmail.equals(""))) {
+            env.put("GIT_COMMITTER_EMAIL", confEmail);
+            env.put("GIT_AUTHOR_EMAIL", confEmail);
+        }
+
     }
 
     private void putChangelogDiffs(IGitAPI git, String branchName, String revFrom,