mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-15 16:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

cli: rephrase hint for updating just one branch by "branch move"

Browse source 
Suggested by Ilya.
This commit is contained in:
Yuya Nishihara 2024-07-05 07:18:50 +09:00
parent cdc0cc3601
commit 1cae93ce27
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/src/commands/branch/move.rs
View file

@ -130,7 +130,10 @@ pub fn cmd_branch_move(
writeln!(formatter)?; writeln!(formatter)?;
} }
if matched_branches.len() > 1 && args.names.is_empty() { if matched_branches.len() > 1 && args.names.is_empty() {
writeln!(ui.hint_default(), "Specify branch by name to update one.")?; writeln!(
ui.hint_default(),
"Specify branch by name to update just one of the branches."
)?;
} }
Ok(()) Ok(())
} }

2
cli/tests/test_branch_command.rs
View file

@ -254,7 +254,7 @@ fn test_branch_move_matching() {
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "move", "--from=::@"]); let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "move", "--from=::@"]);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Moved 2 branches to vruxwmqv a2781dd9 b1 c1 | (empty) head2 Moved 2 branches to vruxwmqv a2781dd9 b1 c1 | (empty) head2
Hint: Specify branch by name to update one. Hint: Specify branch by name to update just one of the branches.
"###); "###);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
@ b1 c1 a2781dd9ee37 @ b1 c1 a2781dd9ee37