github-merge: warn if merge message contains an @ #32
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
maflcko
reviewed
Aug 25, 2019
fanquake
force-pushed
the
gh_merge_check_for_at_sign
branch
from
f11c0ac
to
b2e1a81
Compare
fanquake
force-pushed
the
gh_merge_check_for_at_sign
branch
from
b2e1a81
to
036457e
Compare
|
ACK 036457e |
laanwj
added a commit
that referenced
this pull request
Aug 26, 2019
036457e github-merge: warn if merge message contains an @ (fanquake) Pull request description: Fixes #30. Warn if the merge message contains an "@". Can be tested with bitcoin/bitcoin#16439. ```bash merge 16439 Auto-merging test/functional/rpc_blockchain.py Auto-merging src/rpc/util.cpp Auto-merging src/rpc/rawtransaction.cpp Auto-merging src/rpc/blockchain.cpp Auto-merging src/qt/rpcconsole.cpp Auto-merging src/bitcoin-cli.cpp #16439 RPC: support "@height" in place of blockhash for getblock etc into master * f4bcae95ae89cbd6512b4347bb0ba68ac8fe4d35 qt getblock %123 (Anthony Towns) (pull/16439/head) * 817a8d2e42b521cd2910a1b0a2ab3f6e4219b831 bitcoin-cli: support "getblock %height" by doing "getblockhash height" on client side (Anthony Towns) * c27f59ff71e2d67231631469ac88609a39d18f35 Add Type::BLOCK_REF for hash/@height (Anthony Towns) * 792c2a5dbca346e1b693446accd68b6a5448292f rpc: getblockstats deprecate hash_or_height (Anthony Towns) * e0ef6430628ecd1651a28bbeb65c9c5651414fc4 rpc: @height for other rpc commands accepting a blockhash (Anthony Towns) * a1118b68ad1eb14501600e1badc3dcbd4e2b2365 rpc: Add test for getblockbyheight (Emil Engler) * f48dac4d1ca1fe753b2ff3928ae80ccb12abff34 rpc: getblock @height (Anthony Towns) Dropping you on a shell so you can try building/testing the merged source. Run 'git diff HEAD~' to show the changes being merged. Type 'exit' when done. bash-3.2$ exit exit [pull/16439/local-merge f10d37f36] Merge #16439: RPC: support "@height" in place of blockhash for getblock etc Date: Sun Aug 25 19:10:56 2019 +0800 #16439 RPC: support "@height" in place of blockhash for getblock etc into master * f4bcae95ae89cbd6512b4347bb0ba68ac8fe4d35 qt getblock %123 (Anthony Towns) (pull/16439/head) * 817a8d2e42b521cd2910a1b0a2ab3f6e4219b831 bitcoin-cli: support "getblock %height" by doing "getblockhash height" on client side (Anthony Towns) * c27f59ff71e2d67231631469ac88609a39d18f35 Add Type::BLOCK_REF for hash/@height (Anthony Towns) * 792c2a5dbca346e1b693446accd68b6a5448292f rpc: getblockstats deprecate hash_or_height (Anthony Towns) * e0ef6430628ecd1651a28bbeb65c9c5651414fc4 rpc: @height for other rpc commands accepting a blockhash (Anthony Towns) * a1118b68ad1eb14501600e1badc3dcbd4e2b2365 rpc: Add test for getblockbyheight (Emil Engler) * f48dac4d1ca1fe753b2ff3928ae80ccb12abff34 rpc: getblock @height (Anthony Towns) Top commit has no ACKs! Merge message contains an @! Type 's' to sign off on the above merge, or 'x' to reject and exit. x Not signing off on merge, exiting. ``` ACKs for top commit: laanwj: ACK 036457e Tree-SHA512: 3bd24baf272f2882e4c4bf6dbd770b57fa21fe098be7aae21e9ccf58531a4b7ec543b3875c9ac15f2d0c0fe423fa547c7c2f4290bbd8a7cce1127535b4d92cf8
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.
Fixes #30. Warn if the merge message contains an "@".
Can be tested with bitcoin/bitcoin#16439.