mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-04 05:28:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

cli: report no updates to current branch

Browse source 
Fix a bug where `jj git push` would print "No current branch." when
there is a current branch but it is unchanged. We were conflating the
two because we print the message when no updates were performed, instead
of only when no branches were found.
This commit is contained in:
Glen Choo 2023-01-30 11:46:29 +08:00
parent 3418c8ff73
commit b338c916c0
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/commands/git.rs
View file

@ -659,6 +659,9 @@ fn cmd_git_push(
);
}
}
if branches.is_empty() {
return Err(user_error("No current branch."));
}
for (branch_name, branch_target) in branches {
if !seen_branches.insert(branch_name.clone()) {
continue;
@ -675,9 +678,6 @@ fn cmd_git_push(
}
}
}
if branch_updates.is_empty() {
return Err(user_error("No current branch."));
}
tx = workspace_command.start_transaction(&format!(
"push current branch(es) to git remote {}",
&remote

10
tests/test_git_push.rs
View file

@ -129,6 +129,16 @@ fn test_git_push_no_current_branch() {
"###);
}
#[test]
fn test_git_push_current_branch_unchanged() {
let (test_env, workspace_root) = set_up();
test_env.jj_cmd_success(&workspace_root, &["co", "branch1"]);
let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push"]);
insta::assert_snapshot!(stdout, @r###"
Nothing changed.
"###);
}
#[test]
fn test_git_push_multiple() {
let (test_env, workspace_root) = set_up();