mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-04 13:55:23 -05:00
Merge bitcoin/bitcoin#31118: doc: replace -?
with -h
and -help
33a28e252a
Change default help arg to `-help` and mention `-h` and `-?` as alternatives (Lőrinc)f0130ab1a1
doc: replace `-?` with `-h` for bench_bitcoin help (Lőrinc) Pull request description: The question mark is interpreted as a wildcard for any single character in Zsh (see https://www.techrepublic.com/article/globbing-wildcard-characters-with-zsh), so `bench_bitcoin -?` will not show the help message on systems using Zsh, such as macOS. Since `-h` provides equivalent help functionality (as defined in https://github.com/bitcoin/bitcoin/blob/master/src/common/args.cpp#L684-L693), the `benchmarking.md` documentation has been updated to ensure compatibility with macOS. ---- ### -? > % cmake -B build -DBUILD_BENCH=ON && cmake --build build && build/src/bench/bench_bitcoin -? zsh: no matches found: -? ### -h > % cmake -B build -DBUILD_BENCH=ON && cmake --build build && build/src/bench/bench_bitcoin -h Usage: bench_bitcoin [options] Options: ... ---- Based on the comments the args help default was also changed to `-help`, mentioning `-h` and `-?` (instead of `-?` being the default) ACKs for top commit: edilmedeiros: tACK33a28e252a
maflcko: lgtm ACK33a28e252a
achow101: ACK33a28e252a
rkrux: tACK33a28e252a
laanwj: Code review ACK33a28e252a
Tree-SHA512: 8c6e27488462be9ba9186b34abe6249c1d93026b3963acc0f42c75496f39407563766ae518cf1839156039cc0047e29d91f70d191cfb97e0fbde85665e88c71e
This commit is contained in:
commit
7640cfdd62
3 changed files with 4 additions and 4 deletions
|
@ -40,7 +40,7 @@ The output will look similar to:
|
|||
Help
|
||||
---------------------
|
||||
|
||||
build/src/bench/bench_bitcoin -?
|
||||
build/src/bench/bench_bitcoin -h
|
||||
|
||||
To print the various options, like listing the benchmarks without running them
|
||||
or using a regex filter to only run certain benchmarks.
|
||||
|
|
|
@ -688,8 +688,8 @@ bool HelpRequested(const ArgsManager& args)
|
|||
|
||||
void SetupHelpOptions(ArgsManager& args)
|
||||
{
|
||||
args.AddArg("-?", "Print this help message and exit", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
|
||||
args.AddHiddenArgs({"-h", "-help"});
|
||||
args.AddArg("-help", "Print this help message and exit (also -h or -?)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
|
||||
args.AddHiddenArgs({"-h", "-?"});
|
||||
}
|
||||
|
||||
static const int screenWidth = 79;
|
||||
|
|
|
@ -23,7 +23,7 @@ CMD_GREP_WALLET_ARGS = r"git grep --function-context 'void WalletInit::AddWallet
|
|||
CMD_GREP_WALLET_HIDDEN_ARGS = r"git grep --function-context 'void DummyWalletInit::AddWalletOptions' -- {}".format(CMD_ROOT_DIR)
|
||||
CMD_GREP_DOCS = r"git grep --perl-regexp '{}' {}".format(REGEX_DOC, CMD_ROOT_DIR)
|
||||
# list unsupported, deprecated and duplicate args as they need no documentation
|
||||
SET_DOC_OPTIONAL = set(['-h', '-help', '-dbcrashratio', '-forcecompactdb'])
|
||||
SET_DOC_OPTIONAL = set(['-h', '-?', '-dbcrashratio', '-forcecompactdb'])
|
||||
|
||||
|
||||
def lint_missing_argument_documentation():
|
||||
|
|
Loading…
Add table
Reference in a new issue