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

[ja...@mccarthy.vg (JIRA)]

Title: Message Title

Jamie McCarthy commented on JENKINS-34369   Re: NPE on PreBuildMerge.decorateRevisionToBuild I'm seeing what seems to be the same issue, though if it's because of a merge conflict I can't see how. I've confirmed that the branches specified in the configuration ("Branch specifier" and "Branch to merge to") don't have any conflicts, making sure that the revision SHA of the former is what I expect it to be. My attempts are with mergeStrategy='default' and with fastForwardMode either '- ff' or ' -no-ff'. Adding the behavior of "Wipe out repository & force clone" didn't help. Jenkins 1.656, git 2.4.1, git-client 1.19.6, github 1.19.1 git rev-parse origin/source_branch^{commit} # timeout=10 Merging Revision e9093107657cca2d27065f28ec39eec0edb94d51 (origin/source_branch) to origin/dest_branch, UserMergeOptions{mergeRemote='origin', mergeTarget='dest_branch', mergeStrategy='default', fastForwardMode='--ff'} git rev-parse origin/dest_branch^{commit} # timeout=10 git config core.sparsecheckout # timeout=10 git checkout -f origin/dest_branch git merge --ff e9093107657cca2d27065f28ec39eec0edb94d51 # timeout=10 git config core.sparsecheckout # timeout=10 git checkout -f e9093107657cca2d27065f28ec39eec0edb94d51 FATAL: null java.lang.NullPointerException at hudson.plugins.git.extensions.impl.PreBuildMerge.decorateRevisionToBuild(PreBuildMerge.java:88) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:965) 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.