buildbot-contrib icon indicating copy to clipboard operation
buildbot-contrib copied to clipboard
verified publisher icon buildbot

Fix incorrect behavior of `git_buildbot.py` when using `--first-parent` option

Open ivanov17 opened this issue 2 years ago • 3 comments

This is the fix for https://github.com/buildbot/buildbot-contrib/issues/24

It prevents changes from being lost when using the --first-parent option. Added full diff showing for merge commits when the option is enabled. Otherwise, the default behavior is retained.

The behavior when creating a branch has also been fixed. It now matches the behavior when updating a branch: when this option is enabled, changes will not be added from merged commits. This prevents duplication of changes and triggering builds for them twice.

The changes have been tested and work as expected.

ivanov17 avatar Oct 16 '23 21:10 ivanov17

@tardyp @rutsky @djmitche Sorry, can you look at the pull request? These are minor changes.

ivanov17 avatar Oct 24 '23 01:10 ivanov17

Hi @ivanov17, I apologize, but I haven't used Buidbot in almost a decade :(

djmitche avatar Oct 24 '23 01:10 djmitche

@djmitche Thank you anyway. @p12tic is currently an active maintainer of Buildbot, but he does not have write permissions to this repository. Maybe this situation can be corrected?

ivanov17 avatar Oct 24 '23 01:10 ivanov17