![]() |
|
|
|
|
Change By:
|
Mark Waite
(09/Aug/14 1:36 PM)
|
|
Description:
|
The "Recent Changes" list in merge jobs which use the Git plugin are now empty. Prior to Git plugin 2.0, the "Recent Changes" list showed those changes whose merge was attempted, whether the merge succeeded or not
Steps to duplicate the problem (with apologies for the number of steps)
# Create a bare git repo on the master node as Jenkins user
## {{rm -rf /tmp/changes.git /tmp/changes}}
## {{git init --bare /tmp/changes.git}}
## {{echo "#! /bin/sh" > /tmp/changes.git/hooks/post-receive}}
## echo "curl --silent http://127.0.0.1:8080/git/notifyCommit?url="">
\
" >> /tmp/changes.git/hooks/post-receive
## {{chmod a+x /tmp/changes.git/hooks/post-receive}}
## {{cd /tmp}}
## {{git clone changes.git}}
## {{cd changes}}
## {{echo "Git plugin 2.0 no longer shows changes from merges" > README}}
## {{git add README}}
## {{git commit -m "Add README to describe this repository" README}}
## {{git push origin master}}
# Create a Jenkins merge job using that bare git repo
## Create a new free-style software project "merge-changes"
## Restrict where this project can be run
### Label _expression_: master
## Git source code management settings
### Repository URL: /tmp/changes.git
### Branches to build: \*/master\*
## Additional behaviors: Merge before build
### Name of repository: origin
#### (error on merge if this is blank - help says should use default, but didn't)
### Branch to merge to: master
## Poll SCM (for convenience with the git hook installed earlier)
### H * * * *
## Add post-build action: Git Publisher
### Git Publisher settings
#### Merge results: Yes
#### Branches:
##### Branches to push: master
##### Target remote name: origin
## Save the job
# Build Jenkins job
## curl --silent http://127.0.0.1:8080/job/merge-changes/build?delay=0sec
### Note that the "Recent Changes" will report no changes in any build
# Create new master-add-timestamp branch and commit from it
## {{git checkout -b master-add-timestamp}}
## {{date >> timestamp}}
## {{git add timestamp}}
## {{git commit -m "Add timestamp" timestamp}}
## {{git push origin master-add-timestamp}}
# Jenkins job runs, but "Recent Changes" still reports "No changes in any of the builds"
# Confirm master branch received the merge result
## {{git checkout master}}
## {{git pull}}
# Create new master-add-timestamp2 branch and commit from it
## {{git checkout -b master-add-timestamp2}}
## {{date >> timestamp2}}
## {{git add timestamp2}}
## {{git commit -m "Add new timestamp2" timestamp2}}
## {{git push origin master-add-timestamp2}}
## BUG: Merge will happen and be pushed, but no change listed
# Confirm master branch received the merge result
## {{git checkout master}}
## {{git pull}}
|
|
|
|
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
jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit
https://groups.google.com/d/optout.
