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.

Sign up for GitHub

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

Jump to bottom

[git-webkit] Found branch name instead of hash #285

Merged
merged 0 commits into from Apr 13, 2022
Merged

[git-webkit] Found branch name instead of hash #285

merged 0 commits into from Apr 13, 2022

Conversation

JonWBedard
Copy link
Member

@JonWBedard JonWBedard commented Apr 13, 2022 •
edited by webkit-early-warning-system

b7d3962

[git-webkit] Found branch name instead of hash
https://bugs.webkit.org/show_bug.cgi?id=239296
<rdar://problem/91720224 >

Reviewed by Michael Catanzaro.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.Cache.populate): Add --no-decorate to `git log` command.
(Git.commit): Ditto.
(Git.commits): Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
(TestGit.test_log): Ditto.

Canonical link: https://commits.webkit.org/249617@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292844 268f45cc-cd09-0410-ab3c-d52691b4dbfc

@JonWBedard JonWBedard self-assigned this Apr 13, 2022
@JonWBedard JonWBedard added Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases WebKit Nightly Build labels Apr 13, 2022
@mcatanzaro
Copy link
Contributor

Note the style bot is unhappy

@JonWBedard
Copy link
Member Author

Note the style bot is unhappy

Yes, we need to modify our Python style checker a little bit, it doesn't like our mocks.

@JonWBedard JonWBedard force-pushed the eng/git-webkit-Found-branch-name-instead-of-hash branch from bb5f270 to 2183c11 Compare April 13, 2022 23:37
@JonWBedard JonWBedard added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 13, 2022
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/git-webkit-Found-branch-name-instead-of-hash branch from 2183c11 to b7d3962 Compare April 13, 2022 23:43
@webkit-early-warning-system webkit-early-warning-system merged commit b7d3962 into WebKit:main Apr 13, 2022
@webkit-early-warning-system
Copy link
Collaborator

Committed r292844 (249617@main): https://commits.webkit.org/249617@main

Reviewed commits have been landed. Closing PR #285 and removing active labels.

@webkit-early-warning-system webkit-early-warning-system removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 13, 2022
@JonWBedard JonWBedard deleted the eng/git-webkit-Found-branch-name-instead-of-hash branch April 14, 2022 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcatanzaro mcatanzaro mcatanzaro approved these changes

@aj062 aj062 Awaiting requested review from aj062

@ryanhaddad ryanhaddad Awaiting requested review from ryanhaddad

Assignees

@JonWBedard JonWBedard

Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
Milestone
No milestone
3 participants
@JonWBedard @mcatanzaro @webkit-early-warning-system