Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] git-subtree-check.sh updated to latest upstream #2473

Merged
merged 1 commit into from
Jul 21, 2021

Conversation

furszy
Copy link

@furszy furszy commented Jul 7, 2021

Pulled latest git-subtree-check.sh changes from upstream. So it's easier to verify the new subtree that is being included in #2419.

@furszy furszy self-assigned this Jul 7, 2021
@furszy furszy added this to the 6.0.0 milestone Jul 7, 2021
@furszy
Copy link
Author

furszy commented Jul 18, 2021

rebased due conflicts with a recent merged PR.

random-zebra
random-zebra previously approved these changes Jul 19, 2021
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 5025ba5

Fuzzbawls
Fuzzbawls previously approved these changes Jul 21, 2021
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 5025ba5 with a note:

The location of this shell script was changed in #2452 (from contrib/devtools to test/lint). when that PR was merged it prompted this to be rebased. a previous comment here was to PIVXify the help text, which included referencing the (correct-at-the-time) script's location in the tree as contrib/devtools.

Post #2452 merge and after rebase, the help text should be referencing test/lint. Other than that, GTG

@furszy
Copy link
Author

furszy commented Jul 21, 2021

yeah, will push it shortly.

Plus use bls-repo in the help example.
@furszy furszy dismissed stale reviews from Fuzzbawls and random-zebra via 855aa70 July 21, 2021 18:23
@furszy furszy force-pushed the 2021_update_subtree_check branch from 5025ba5 to 855aa70 Compare July 21, 2021 18:23
@furszy
Copy link
Author

furszy commented Jul 21, 2021

Updated, can get merged right away.

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 855aa70 and merging...

@random-zebra random-zebra merged commit bca2c24 into PIVX-Project:master Jul 21, 2021
@furszy furszy deleted the 2021_update_subtree_check branch June 23, 2023 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants