diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java index 610e626c..87cafa24 100644 --- a/src/main/java/hudson/plugins/git/GitSCM.java +++ b/src/main/java/hudson/plugins/git/GitSCM.java @@ -619,7 +619,7 @@ public boolean checkout(final AbstractBuild build, Launcher launcher, } List repos = entry.getValue(); - final Revision revToBuild = gerRevisionToBuild(listener, workingDirectory, gitExe, buildData, environment, + final Revision revToBuild = getRevisionToBuild(listener, workingDirectory, gitExe, buildData, environment, singleBranch, repos, parentLastBuiltRev, rpa); @@ -647,7 +647,6 @@ public boolean checkout(final AbstractBuild build, Launcher launcher, buildConfig = getBuildConfig(listener, workingDirectory, buildNumber, gitExe, buildData, environment, paramLocalBranch, repos, revToBuild, internalTagName, internalTagComment); - build.addAction(buildConfig.getBuildData()); result = result && changeLogResult(buildConfig.getChangeLog(), changelogFile); @@ -838,7 +837,7 @@ public BuildConfig invoke(File localWorkspace, VirtualChannel channel) }); } - private Revision gerRevisionToBuild(final BuildListener listener, FilePath workingDirectory, final String gitExe, + private Revision getRevisionToBuild(final BuildListener listener, FilePath workingDirectory, final String gitExe, final BuildData buildData, final EnvVars environment, final String singleBranch, final List paramRepos, final Revision parentLastBuiltRev, final RevisionParameterAction rpa) throws IOException, InterruptedException { @@ -1462,18 +1461,16 @@ private RemoteConfig newRemoteConfig(String name, String refUrl, RefSpec refSpec } } - private boolean changeLogResult(String changeLog, File changelogFile) throws IOException { - if (changeLog == null) { - return false; - } else { - changelogFile.delete(); + private boolean changeLogResult(String changeLog, File changeLogFile) throws IOException { + changeLogFile.delete(); - FileOutputStream fos = new FileOutputStream(changelogFile); + if (changeLog != null) { + FileOutputStream fos = new FileOutputStream(changeLogFile); fos.write(changeLog.getBytes()); fos.close(); - // Write to file - return true; } + + return true; } private Pattern[] getExcludedRegionsPatterns() {