[FIXED JENKINS-14321] don't reuse last build environment for fast pol…

…ling
jenkinsci · Aug 8, 2012 · 3d9a73d · 3d9a73d · ciaranj · Aug 8, 2012
1 parent e1c5736
commit 3d9a73d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -678,7 +678,7 @@ protected PollingResult compareRemoteRevisionWith(AbstractProject<?, ?> project,
                     break;
                 }
             }
-            final EnvVars environment = GitUtils.getPollEnvironment(project, workspace, launcher, listener);
+            final EnvVars environment = GitUtils.getPollEnvironment(project, workspace, launcher, listener, false);
             IGitAPI git = new GitAPI(gitExe, workspace, listener, environment, reference);
             String gitRepo = getParamExpandedRepos(lastBuild).get(0).getURIs().get(0).toString();
             String headRevision = git.getHeadRev(gitRepo, getBranches().get(0).getName());

diff --git a/src/main/java/hudson/plugins/git/util/GitUtils.java b/src/main/java/hudson/plugins/git/util/GitUtils.java
@@ -171,11 +171,17 @@ public List<Revision> filterTipBranches(Collection<Revision> revisions) {
         return l;
     }
 
+    public static EnvVars getPollEnvironment(AbstractProject p, FilePath ws, Launcher launcher, TaskListener listener)
+        throws IOException, InterruptedException {
+        return getPollEnvironment(p, ws, launcher, listener, true);
+    }
+
+
     /**
      * An attempt to generate at least semi-useful EnvVars for polling calls, based on previous build.
      * Cribbed from various places.
      */
-    public static EnvVars getPollEnvironment(AbstractProject p, FilePath ws, Launcher launcher, TaskListener listener)
+    public static EnvVars getPollEnvironment(AbstractProject p, FilePath ws, Launcher launcher, TaskListener listener, boolean reuseLastBuildEnv)
         throws IOException,InterruptedException {
         EnvVars env;
         StreamBuildListener buildListener = new StreamBuildListener((OutputStream)listener.getLogger());