I've been trying to test on my changes to the git-plugin and ran into fatal errors, which Im pretty sure that were not caused by my changes (see JOB_LOG)
I cloned a test repo and it has a origin/master and one origin/feata branch on it.
In order to test merging, I entered the full path to the repo, a build branch feata and I defined "master" as the branch to merge to (mergeoptions).
I also tried other configs and all resulted in the log below.
Started by user [8mha:AAAAih+LCAAAAAAAAABb85aBtbiIQSajNKU4P08vOT+vOD8nVc+jsiC1KCczL9svvyT1dMUiOWdZ/mImBiZPBrac1Lz0kgwfBubSopwSBiGfrMSyRP2cxLx0/eCSosy8dOuKIgYpNOOcITTIMAYIYGRiYKgoADI4Sxi49EuLU4v080pzcgCbGluCjwAAAA== [0manonymous
Building in workspace path.../workspace/testee
Checkout:testee / path.../workspace/testee - hudson.remoting.LocalChannel@bb3e2
Using strategy: Default
Fetching changes from 1 remote Git repository
Fetching upstream changes from origin
Commencing build of Revision 585bdf79569179bdccffa6cd540c08561ff0fce1 (origin/feata)
MergeFlag entered:--no-ff <--- At this point a flag that I introduces is wirrten to the enviroment (not the problem)
Merging Revision 585bdf79569179bdccffa6cd540c08561ff0fce1 (origin/feata) onto master
FATAL: Command "git rev-parse origin/master^{commit}" returned status code 128:
stdout: origin/master^{commit}
stderr: fatal: ambiguous argument 'origin/master^{commit}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions
[8mha:AAAAWB+LCAAAAAAAAABb85aBtbiIQSmjNKU4P08vOT+vOD8nVc8DzHWtSE4tKMnMz/PLL0ldFVf2c+b/lb5MDAwVRQxSaBqcITRIIQMEMIIUFgAAckCEiWAAAAA= [0mhudson.plugins.git.GitException: Command "git rev-parse origin/master^{commit}" returned status code 128:
stdout: origin/master^{commit}
stderr: fatal: ambiguous argument 'origin/master^{commit}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:774)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:740)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:750)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.revParse(CliGitAPIImpl.java:264)
at hudson.plugins.git.GitAPI.revParse(GitAPI.java:252)
at hudson.plugins.git.GitSCM$3.invoke(GitSCM.java:1161)
at hudson.plugins.git.GitSCM$3.invoke(GitSCM.java:1143)
at hudson.FilePath.act(FilePath.java:839)
at hudson.FilePath.act(FilePath.java:821)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1143)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1218)
at hudson.model.AbstractBuild$AbstractRunner.checkout(AbstractBuild.java:586)
at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java:475)
at hudson.model.Run.run(Run.java:1438)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46)
at hudson.model.ResourceController.execute(ResourceController.java:88)
at hudson.model.Executor.run(Executor.java:239)