Merge pull request #35 from vjuranek/JENKINS-9843

[FIXED JENKINS-9843] Fixed NPE
jenkinsci · Jul 15, 2011 · b3ea09e · b3ea09e
2 parents 421d838 + 2c59d40
commit b3ea09e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java b/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() {