mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

tests: run "git push" with both --change and --branch arguments

Browse source 
It's unclear whether --change should precede or not, but it's wrong to try to
push the same branch twice.
This commit is contained in:
Yuya Nishihara 2024-03-17 16:09:06 +09:00
parent e50d96e01d
commit f88679bb45
1 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
cli/tests/test_git_push.rs
View file

@ -421,6 +421,57 @@ fn test_git_push_changes() {
Branch changes to push to origin:
Force branch push-yostqsxwqrlt from 48d8c7948133 to b5f030322b1d
"###);
// FIXME: specifying the same branch with --change/--branch doesn't break things
std::fs::write(workspace_root.join("file"), "modified4").unwrap();
let (stdout, stderr) = test_env.jj_cmd_ok(
&workspace_root,
&["git", "push", "-c=@", "-b=push-yostqsxwqrlt"],
);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Branch changes to push to origin:
Force branch push-yostqsxwqrlt from b5f030322b1d to 4df62cec2ee4
Force branch push-yostqsxwqrlt from b5f030322b1d to 4df62cec2ee4
"###);
// FIXME: try again with --change that moves the branch forward
std::fs::write(workspace_root.join("file"), "modified5").unwrap();
test_env.jj_cmd_ok(
&workspace_root,
&[
"branch",
"set",
"-r=@-",
"--allow-backwards",
"push-yostqsxwqrlt",
],
);
let stdout = test_env.jj_cmd_success(&workspace_root, &["status"]);
insta::assert_snapshot!(stdout, @r###"
Working copy changes:
M file
Working copy : yostqsxw 3e2ce808 bar
Parent commit: yqosqzyt fa16a141 push-yostqsxwqrlt* push-yqosqzytrlsw | foo
"###);
let (stdout, stderr) = test_env.jj_cmd_ok(
&workspace_root,
&["git", "push", "-c=@", "-b=push-yostqsxwqrlt"],
);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Branch changes to push to origin:
Force branch push-yostqsxwqrlt from 4df62cec2ee4 to fa16a14170fb
Force branch push-yostqsxwqrlt from 4df62cec2ee4 to 3e2ce808759b
"###);
let stdout = test_env.jj_cmd_success(&workspace_root, &["status"]);
insta::assert_snapshot!(stdout, @r###"
Working copy changes:
M file
Working copy : yostqsxw 3e2ce808 push-yostqsxwqrlt | bar
Parent commit: yqosqzyt fa16a141 push-yqosqzytrlsw | foo
"###);
// Test changing `git.push-branch-prefix`. It causes us to push again.
let (stdout, stderr) = test_env.jj_cmd_ok(
&workspace_root,
@ -436,7 +487,7 @@ fn test_git_push_changes() {
insta::assert_snapshot!(stderr, @r###"
Creating branch test-yostqsxwqrlt for revision @
Branch changes to push to origin:
Add branch test-yostqsxwqrlt to b5f030322b1d
Add branch test-yostqsxwqrlt to 3e2ce808759b
"###);
}