Adding script options to help run current spec better#2
Open
Ataraxia009 wants to merge 3 commits intobitcoinknots:masterfrom
Open
Adding script options to help run current spec better#2Ataraxia009 wants to merge 3 commits intobitcoinknots:masterfrom
Ataraxia009 wants to merge 3 commits intobitcoinknots:masterfrom
Conversation
Ataraxia009
changed the title
luke-jr
requested changes
Nov 5, 2025
| my $find_obsolete_merges; | ||
|
|
||
| GetOptions( | ||
| "bitcoin-core-master-branch=s" => \$bitcoin_core_master_branch, |
Contributor
There was a problem hiding this comment.
Too project-specific naming
|
|
||
| # check if branch upstream_branch is accessible via remote | ||
| my $get_upstream_ec = gitmayfail("rev-parse", $upstreambranch); | ||
| if (not $get_upstream_ec) { |
Contributor
There was a problem hiding this comment.
Should only be a condition if $ignore_missing_upstreams ?
Author
There was a problem hiding this comment.
i wrote it different, it seemed best to change this get_latest_upstream_branch function be stupid and try and return the latest upstreams if it can, instead of deciding what to do if the latest upstreams were not present.
then the caller can decide what to do if the upstreams are there are not.
just seems like better design
| $latest_upstream = $upstream; | ||
| $latest_upstream_time = $upstream_time; | ||
| } | ||
| die "Latest upstream is undefined!" unless $latest_upstream; |
Author
There was a problem hiding this comment.
we do, its just more downstream in the codepath
Ataraxia009
force-pushed
the
adding-more-options-for-versatility
branch
from
d9f73b4 to
0f22770
Compare
luke-jr
reviewed
Nov 10, 2025
|
|
||
| $ENV{GIT_COMMITTER_NAME} = "merge-script"; | ||
| $ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME}; | ||
| $ENV{GIT_COMMITTER_EMAIL} = "[email protected]"; |
Contributor
There was a problem hiding this comment.
Should probably set this in the spec file?
Ataraxia009
force-pushed
the
adding-more-options-for-versatility
branch
from
0f22770 to
098ce0d
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Adding 2 more options:
bitcoin-core-master-branch: allow custom branch name for master, not everybody has it named master
ignore-missing-upstreams: Add option to ignore upstream checks for branches whose upstream has been deleted or removed
adding static committer and author email