[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title Mark Waite commented on JENKINS-55524 Re: Triggers on wrong branch when pushing multiple merges Aaron Jensen recommends using --points-at instead of --contains. I think that seems like a reasonable idea though it will require special handling for the cases where the command line git version is 2.6.0 or older (CentOS 6, CentOS 7, Red Hat Enterprise Linux 6, Red Hat Enterprise Linux 7, and likely several others). Thankfully, Ubuntu 16 and Debian 9 both include a command line git version that supports the --points-at argument. Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- 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. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.196657.1547153222000.7513.1576327320287%40Atlassian.JIRA.
[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title ovi craciun commented on JENKINS-55524 Re: Triggers on wrong branch when pushing multiple merges we are seeing this behavior 1. we have a project with "Build when a change is pushed to BitBucket" checked and "Branch Specifier (blank for 'any') " as origin/development. This one works as expected. 2. we have a second project with "Build when a change is pushed to BitBucket" checked and "Branch Specifier (blank for 'any') " as origin/master. This project is triggered for any commit to any branch. the only difference between the two projects is the branch it is supposed to build. Add Comment This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f) -- 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. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-issues/JIRA.196657.1547153222000.5333.1576068900552%40Atlassian.JIRA.
[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title Aaron Jensen commented on JENKINS-55524 Re: Triggers on wrong branch when pushing multiple merges Not a duplicate. This is a different issue. Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- 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.
[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title andrew lorien commented on JENKINS-55524 Re: Triggers on wrong branch when pushing multiple merges Possible duplicate of https://issues.jenkins-ci.org/browse/JENKINS-50168 ? The solution there is different, but the symptom seems very similar Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- 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.
[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title Mark Waite assigned an issue to Unassigned Jenkins / JENKINS-55524 Triggers on wrong branch when pushing multiple merges Change By: Mark Waite Assignee: Mark Waite Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- 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.
[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title
Aaron Jensen updated an issue
Jenkins / JENKINS-55524
Triggers on wrong branch when pushing multiple merges
Change By:
Aaron Jensen
We use Bitbucket Server for source control. We have three permanent branches: develop, release, master. We have automatic merges turned on so that for any PR/merge into the release branch, Bitbucket will merge release into the develop branch. For any PR/merge into the master branch, Bitbucket will merge master into release *and* develop. Bitbucket is configured to always create a new merge commit.After the merge, Bitbucket sends a commit notification to Jenkins. In the situation of a merge into release, two notifications are sent: one for the merge into release and another for the automatic merge into the develop branch.When the git plugin polls for what branches are included in the merge to release commit , it sees both the develop *and* release branch instead of just the release branch. It looks like the Git plugin is using {{--contains - }} instead of {{- - points-at}} to determine what branch a commit points to.Steps to Reproduce:1. Create a repo. 2. Create a develop branch. Make a commit on that branch.3. Make a release branch.4. Make a new commit on the develop branch. Merge it into the release branch.5. Merge the release branch into the develop branch. `git log -2 --graph` should look something like this: {code :java }* commit e00fb35bcd9b7fc218f0c6b7aec352d7ad1fb62e (HEAD -> develop, tag: 2019.110.100, origin/develop, origin/HEAD) |\ Merge: a251303 366bf67 | | Author: | | Date: Thu Jan 10 10:34:48 2019 -0800 | | | | Automatic merge from release -> develop | | | | * commit '366bf67833c09f8d09280d8ec31b8142dfd5c43f': | | | * commit 366bf67833c09f8d09280d8ec31b8142dfd5c43f (tag: 2019.110.99, origin/release) | |\ Merge: 60db8dd a251303 | |/ Author: |/| Date: Thu Jan 10 10:34:48 2019 -0800 | | | | Merge pull request #11 from develop to release | | | | * commit 'a251303c15524fad76d3634834ffe6b8aec51dbe': | | {code} 6. Create a Jenkins freestyle job that polls your repository but doesn't actually poll the repository. Set the branches to build to {{origin/**}}.7. Make a notifyCommit web request for the merge to release commit: {{ [ https:///git/notifyCommit?url=""> |https://%2A%2A%2A%2A%2A%2A%2A%2A/git/notifyCommit?url=""> }}8. Note that the plugin reports the build happening on the develop branch instead of the release branch. I would expect (and want) the build to run on the release branch.I think the problem is with the command to determine what branches a commit points to. The plugin is currently using:{ {> code} git bra
[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title
Aaron Jensen updated an issue
Jenkins / JENKINS-55524
Triggers on wrong branch when pushing multiple merges
Change By:
Aaron Jensen
We use Bitbucket Server for source control. We have three permanent branches: develop, release, master. We have automatic merges turned on so that for any PR/merge into the release branch, Bitbucket will merge release into the develop branch. For any PR/merge into the master branch, Bitbucket will merge master into release *and* develop. Bitbucket is configured to always create a new merge commit.After the merge, Bitbucket sends a commit notification to Jenkins. In the situation of a merge into release, two notifications are sent: one for the merge into release and another for the automatic merge into the develop branch.When the git plugin polls for what branches are included in the merge to release commit , it sees both the develop *and* release branch instead of just the release branch. It looks like the Git plugin is using {{--contains}} instead of {{--points-at}} to determine what branch a commit points to.Steps to Reproduce:1. Create a repo. 2. Create a develop branch. Make a commit on that branch.3. Make a release branch.4. Make a new commit on the develop branch. Merge it into the release branch.5. Merge the release branch into the develop branch. `git log -2 --graph` should look something like this:{ { code} * commit e00fb35bcd9b7fc218f0c6b7aec352d7ad1fb62e (HEAD -> develop, tag: 2019.110.100, origin/develop, origin/HEAD) |\ Merge: a251303 366bf67 | | Author: | | Date: Thu Jan 10 10:34:48 2019 -0800 | | | | Automatic merge from release -> develop | | | | * commit '366bf67833c09f8d09280d8ec31b8142dfd5c43f': | | | * commit 366bf67833c09f8d09280d8ec31b8142dfd5c43f (tag: 2019.110.99, origin/release) | |\ Merge: 60db8dd a251303 | |/ Author: |/| Date: Thu Jan 10 10:34:48 2019 -0800 | | | | Merge pull request #11 from develop to release | | | | * commit 'a251303c15524fad76d3634834ffe6b8aec51dbe': | | {code } } 6. Create a Jenkins freestyle job that polls your repository but doesn't actually poll the repository. Set the branches to build to {{origin/**}}.7. Make a notifyCommit web request for the merge to release commit: {{https:///git/notifyCommit?url="">8. Note that the plugin reports the build happening on the develop branch instead of the release branch. I would expect (and want) the build to run on the release branch.I think the problem is with the command to determine what branches a commit points to. The plugin is currently using:{{> git branch -a -v --no-abbrev --contains 366bf67833c09f8d09280d8ec31b8142dfd5c43f}}I bel
[JIRA] (JENKINS-55524) Triggers on wrong branch when pushing multiple merges
Title: Message Title
Aaron Jensen created an issue
Jenkins / JENKINS-55524
Triggers on wrong branch when pushing multiple merges
Issue Type:
Bug
Assignee:
Mark Waite
Components:
git-plugin
Created:
2019-01-10 20:47
Environment:
Jenkins 2.138.3 Git Plugin 2.7.3 Windows 2012 Chrome
Priority:
Minor
Reporter:
Aaron Jensen
We use Bitbucket Server for source control. We have three permanent branches: develop, release, master. We have automatic merges turned on so that for any PR/merge into the release branch, Bitbucket will merge release into the develop branch. For any PR/merge into the master branch, Bitbucket will merge master into release and develop. Bitbucket is configured to always create a new merge commit. After the merge, Bitbucket sends a commit notification to Jenkins. In the situation of a merge into release, two notifications are sent: one for the merge into release and another for the automatic merge into the develop branch. When the git plugin polls for what branches are included in the merge to release commit , it sees both the develop and release branch instead of just the release branch. It looks like the Git plugin is using -contains instead of -points-at to determine what branch a commit points to. Steps to Reproduce: 1. Create a repo. 2. Create a develop branch. Make a commit on that branch. 3. Make a release branch. 4. Make a new commit on the develop branch. Merge it into the release branch. 5. Merge the release branch into the develop branch. `git log -2 --graph` should look something like this: {{* commit e00fb35bcd9b7fc218f0c6b7aec352d7ad1fb62e (HEAD -> develop, tag: 2019.110.100, origin/develop, origin/HEAD)
