![]() |
|
|
|
|
Change By:
|
m r
(20/Feb/14 1:40 PM)
|
|
Issue Type:
|
Bug
Improvement
|
|
Labels:
|
exception
git plugin
publisher
|
|
Environment:
|
Linux Ubuntu 3.2.0-58-generic x86_64
Jenkins ver. 1.546
Git Plugin 2.0
(also with 2.0.1 not working)
Git server plugin 1.3
Jenkins GIT client plugin 1.6.2
|
|
Priority:
|
Major
Minor
|
|
Description:
|
I
wanted to use
am using
the "automatic merging" functionality as described here: "Using Git, Jenkins and pre-build branch merging" ( https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin#GitPlugin-AdvancedFeatures ).
The merging is working well. What
I
configured my job a described with the integration branch (Branch
wanted is
to
have some readable information about which two branches are integratet within a commited
merge
to) configured to "developAutoMerge" and leaved the 'branch' field in the Git SCM blank
result
.
The current comments look like:
When I
"
Build now
Merge commit '6cb5a448d66ab30aca2257123e7c0396fa9fddac' into HEAD
"
I get following exception:
Fetching changes from the remote Git repository
Fetching upstream changes from [email protected]
Seen branch in repository origin
I would be very useful if more informative commit
/
develop
push comments could be written like:
Seen branch in repository origin/developAutoMerge
Seen
"Merged
branch
in repository origin/feature/blabla
[...]
Seen branch in repository origin/master
Seen branch in repository origin/
'
release/2.
6
4
.
1
Seen
7' into
branch
in repository origin/release/2.6.2
Seen 13 remote branches
Multiple candidate revisions
Scheduling another build to catch up with blaServerBuild_developAutoMerge
Merging Revision 6474f8ef91822e58edc55aad707d2725ff5a8431 (origin/feature/blabla) onto /developAutoMerge using resolve strategy
FATAL: Command "git rev-parse /developAutoMerge^{commit}" returned status code 128:
stdout: /developAutoMerge^{commit}
stderr: fatal: ambiguous argument
'
/developAutoMerge^{commit}
develop
'
: unknown revision or path not in the working tree
.
Use
Merge commit
'
--
6cb5a448d66ab30aca2257123e7c0396fa9f8dac
'
to separate paths from revisions
hudson.plugins.git.GitException: Command
into HEAD
"
git rev-parse /developAutoMerge^{commit}" returned status code 128:
stdout: /developAutoMerge^{commit}
stderr: fatal: ambiguous argument '/developAutoMerge^{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:1148)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1125)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1121)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:937)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:947)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.revParse(CliGitAPIImpl.java:401)
at hudson.plugins.git.GitAPI.revParse(GitAPI.java:257)
at hudson.plugins.git.extensions.impl.PreBuildMerge.decorateRevisionToBuild(PreBuildMerge.java:62)
at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:795)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:862)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1415)
at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:652)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88)
at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:561)
at hudson.model.Run.execute(Run.java:1678)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46)
at hudson.model.ResourceController.execute(ResourceController.java:88)
at hudson.model.Executor.run(Executor.java:231)
I
have not
found
a similar problem by googling: https://groups
any customize functionality for this
.
google.com/forum/#!topic/jenkinsci-dev/ek4hYR-z08k
The proposed solution there was downgrading
And using
the
Jenkins Git plugin from 2
tag function for this would be an overhead, since "tons" of tags would be created
.
0 to 1.4.0.
Regards
|
|
|
|
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
|
--
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
[email protected].
For more options, visit
https://groups.google.com/groups/opt_out.
