ok/jj
1
0
Fork 0
forked from mirrors/jj

test_git_push: use -c instead of --change occasionally

This commit is contained in:
Ilya Grigoriev 2023-08-07 18:57:25 -07:00
parent 74d9970908
commit add867cfae

View file

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