mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 07:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: propagate type error of "ui.default-command"

Browse source
This commit is contained in:
Yuya Nishihara 2024-03-06 12:03:33 +09:00
parent 7e28e19945
commit 6498a0cf8a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/src/cli_util.rs
View file

@ -2204,8 +2204,8 @@ fn resolve_default_command(
if let Some(matches) = matches {
if matches.subcommand_name().is_none() {
let args = get_string_or_array(config, "ui.default-command");
if args.is_err() {
let args = get_string_or_array(config, "ui.default-command").optional()?;
if args.is_none() {
writeln!(
ui.hint(),
"Hint: Use `jj -h` for a list of available commands."
@ -2215,7 +2215,7 @@ fn resolve_default_command(
"Run `jj config set --user ui.default-command log` to disable this message."
)?;
}
let default_command = args.unwrap_or_else(|_| vec!["log".to_string()]);
let default_command = args.unwrap_or_else(|| vec!["log".to_string()]);
// Insert the default command directly after the path to the binary.
string_args.splice(1..1, default_command);