martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-21 10:50:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

test_git_push: use -c instead of --change occasionally

Browse Source
This commit is contained in:
Ilya Grigoriev 2023-08-07 18:57:25 -07:00
parent 74d9970908
commit add867cfae
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/tests/test_git_push.rs
View File

@ -259,10 +259,7 @@ fn test_git_push_changes() {
"###); "###);
// test pushing two changes at once // test pushing two changes at once
std::fs::write(workspace_root.join("file"), "modified2").unwrap(); std::fs::write(workspace_root.join("file"), "modified2").unwrap();
let stdout = test_env.jj_cmd_success( let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "-c=@", "-c=@-"]);
&workspace_root,
&["git", "push", "--change", "@", "--change", "@-"],
);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Creating branch push-yqosqzytrlsw for revision @- Creating branch push-yqosqzytrlsw for revision @-
Branch changes to push to origin: Branch changes to push to origin:
@ -271,10 +268,7 @@ fn test_git_push_changes() {
"###); "###);
// specifying the same change twice doesn't break things // specifying the same change twice doesn't break things
std::fs::write(workspace_root.join("file"), "modified3").unwrap(); std::fs::write(workspace_root.join("file"), "modified3").unwrap();
let stdout = test_env.jj_cmd_success( let stdout = test_env.jj_cmd_success(&workspace_root, &["git", "push", "-c=@", "-c=@"]);
&workspace_root,
&["git", "push", "--change", "@", "--change", "@"],
);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
Branch changes to push to origin: Branch changes to push to origin:
Force branch push-yostqsxwqrlt from 48d8c7948133 to b5f030322b1d Force branch push-yostqsxwqrlt from 48d8c7948133 to b5f030322b1d