mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-30 16:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

cli: propagate clap error from handle_early_args()

Browse source 
If we fail to parse the command line, even with `ignore_errors(true)`
set, we currently let clap exit the process for us because we call
`get_matches_from()`. We should instead propagate any errors and
exit in `CliRunner::run()` as usual..
This commit is contained in:
Martin von Zweigbergk 2023-06-28 13:24:58 -07:00 committed by Martin von Zweigbergk
parent db87cb2c39
commit 9995415440
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cli_util.rs
View file

@ -2280,7 +2280,7 @@ fn handle_early_args(
layered_configs: &mut LayeredConfigs, layered_configs: &mut LayeredConfigs,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
// ignore_errors() bypasses errors like "--help" or missing subcommand // ignore_errors() bypasses errors like "--help" or missing subcommand
let early_matches = app.clone().ignore_errors(true).get_matches_from(args); let early_matches = app.clone().ignore_errors(true).try_get_matches_from(args)?;
let mut args: EarlyArgs = EarlyArgs::from_arg_matches(&early_matches).unwrap(); let mut args: EarlyArgs = EarlyArgs::from_arg_matches(&early_matches).unwrap();
if let Some(choice) = args.color { if let Some(choice) = args.color {