Skip to content
Permalink
Browse files

Merge pull request #35 from vjuranek/JENKINS-9843

[FIXED JENKINS-9843] Fixed NPE
  • Loading branch information...
abayer committed Jul 15, 2011
2 parents 421d838 + 2c59d40 commit b3ea09ea4d25177f06d8cd29d275991fc386e2ae
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java
@@ -45,7 +45,7 @@ public void setMergeTarget(String mergeTarget) {

@Exported
public String getRemoteBranchName() {
return mergeRemote.getName() + "/" + mergeTarget;
return (mergeRemote == null) ? null : mergeRemote.getName() + "/" + mergeTarget;
}

public boolean doMerge() {

0 comments on commit b3ea09e

Please sign in to comment.
You can’t perform that action at this time.