[JIRA] [git-plugin] (JENKINS-34369) NPE on PreBuildMerge.decorateRevisionToBuild

[russell.gal...@gmail.com (JIRA)]

Title: Message Title

Russell Gallop commented on JENKINS-34369   Re: NPE on PreBuildMerge.decorateRevisionToBuild I have seen this issue when using the git plugin to merge branches. Git needs to hit a merge conflict (or other error in merging maybe) to hit this problem. Without the pull request (git plugin 2.4.4) > git.exe merge --ff 4f7fc6bad3bc7778104b92950bfc1b3f5e1d3d9d # timeout=10 > git.exe config core.sparsecheckout # timeout=10 > git.exe checkout -f 4f7fc6bad3bc7778104b92950bfc1b3f5e1d3d9d FATAL: null java.lang.NullPointerException at hudson.plugins.git.extensions.impl.PreBuildMerge.decorateRevisionToBuild(PreBuildMerge.java:88) With the pull request applied on top of ce5479a42e74b45dd8b954776ad4220c9c0151bc the problem is reported better. > git.exe merge --ff 4f7fc6bad3bc7778104b92950bfc1b3f5e1d3d9d # timeout=10 > git.exe config core.sparsecheckout # timeout=10 > git.exe checkout -f 4f7fc6bad3bc7778104b92950bfc1b3f5e1d3d9d ERROR: Branch not suitable for integration as it does not merge cleanly: Could not merge AnyObjectId[4f7fc6bad3bc7778104b92950bfc1b3f5e1d3d9d] I think this should have a test case though. Add Comment   This message was sent by Atlassian JIRA (v6.4.2#64017-sha1:e244265) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.