This repository has been archived by the owner on Sep 29, 2024. It is now read-only.
Fix incorrect behavior of git_buildbot.py when using --first-parent option
#25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @ivanov17, I apologize, but I haven't used Buidbot in almost a decade :( |
p12tic
approved these changes
Sep 28, 2024
p12tic
force-pushed
the
git-first-parent-behavior-fix
branch
from
6797052 to
f8e1b66
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the fix for #24
It prevents changes from being lost when using the
--first-parentoption. 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.