cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-29 11:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: fix crash by "jj <global_opts>" without subcommand

Browse Source
This commit is contained in:
Yuya Nishihara 2022-11-20 16:42:50 +09:00
parent a5297c0082
commit 6d500ed66c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands.rs
View File

@ -4548,7 +4548,7 @@ fn cmd_git(
pub fn default_app() -> clap::Command { pub fn default_app() -> clap::Command {
let app: clap::Command = Commands::augment_subcommands(Args::command()); let app: clap::Command = Commands::augment_subcommands(Args::command());
app.arg_required_else_help(true) app.arg_required_else_help(true).subcommand_required(true)
} }
pub fn run_command( pub fn run_command(

15
tests/test_global_opts.rs
View File

@ -42,6 +42,21 @@ fn test_non_utf8_arg() {
"###); "###);
} }
#[test]
fn test_no_subcommand() {
let test_env = TestEnvironment::default();
test_env.jj_cmd_cli_error(test_env.env_root(), &[]);
test_env.jj_cmd_cli_error(test_env.env_root(), &["-R."]);
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--version"]);
insta::assert_snapshot!(stdout.replace(|c: char| c.is_ascii_digit(), "?"), @r###"
jj ?.?.?
"###);
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--help"]);
insta::assert_snapshot!(stdout.lines().next().unwrap(), @"Jujutsu (An experimental VCS)");
}
#[test] #[test]
fn test_no_commit_working_copy() { fn test_no_commit_working_copy() {
let test_env = TestEnvironment::default(); let test_env = TestEnvironment::default();