Skip to content

Commit

Permalink
Do not read commit log file info during polling unless job uses PathR…
Browse files Browse the repository at this point in the history
…estriction (JENKINS-31326)
  • Loading branch information
Brandon Jacklyn committed Nov 2, 2015
1 parent 671a640 commit 54dd430
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/main/java/hudson/plugins/git/GitSCM.java
Expand Up @@ -23,6 +23,7 @@
import hudson.plugins.git.extensions.impl.AuthorInChangelog;
import hudson.plugins.git.extensions.impl.BuildChooserSetting;
import hudson.plugins.git.extensions.impl.ChangelogToBranch;
import hudson.plugins.git.extensions.impl.PathRestriction;
import hudson.plugins.git.extensions.impl.PreBuildMerge;
import hudson.plugins.git.opt.PreBuildMergeOptions;
import hudson.plugins.git.util.Build;
Expand Down Expand Up @@ -1588,7 +1589,11 @@ private boolean isRevExcluded(GitClient git, Revision r, TaskListener listener,
try {
List<String> revShow;
if (buildData != null && buildData.lastBuild != null) {
revShow = git.showRevision(buildData.lastBuild.revision.getSha1(), r.getSha1());
if (getExtensions().get(PathRestriction.class) != null) {
revShow = git.showRevision(buildData.lastBuild.revision.getSha1(), r.getSha1());
} else {
revShow = git.showRevision(buildData.lastBuild.revision.getSha1(), r.getSha1(), false);
}
} else {
revShow = git.showRevision(r.getSha1());
}
Expand Down

0 comments on commit 54dd430

Please sign in to comment.