From add867cfaeca60ef876028e79b7c73c9ea8f4807 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Mon, 7 Aug 2023 18:57:25 -0700 Subject: [PATCH] test_git_push: use -c instead of --change occasionally --- cli/tests/test_git_push.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cli/tests/test_git_push.rs b/cli/tests/test_git_push.rs index 76c457a6c..5e3513a86 100644 --- a/cli/tests/test_git_push.rs +++ b/cli/tests/test_git_push.rs @@ -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