ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

test_git.rs: delete now-useless test

Browse source
This commit is contained in:
Ilya Grigoriev 2024-05-12 21:17:03 -07:00
parent 777da99533
commit 12081166f6
1 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/tests/test_git.rs
View file

@ -2766,34 +2766,6 @@ fn test_push_branches_not_fast_forward() {
let setup = set_up_push_repos(&settings, &temp_dir); let setup = set_up_push_repos(&settings, &temp_dir);
let mut tx = setup.jj_repo.start_transaction(&settings); let mut tx = setup.jj_repo.start_transaction(&settings);
let targets = GitBranchPushTargets {
branch_updates: vec![(
"main".to_owned(),
BranchPushUpdate {
old_target: Some(setup.main_commit.id().clone()),
new_target: Some(setup.sideways_commit.id().clone()),
},
)],
};
let result = git::push_branches(
tx.mut_repo(),
&get_git_repo(&setup.jj_repo),
"origin",
&targets,
git::RemoteCallbacks::default(),
);
// Short-term TODO: This test is now equivalent to the following one, and
// will be removed in a follow-up commit.
assert_eq!(result, Ok(()));
}
#[test]
fn test_push_branches_not_fast_forward_with_force() {
let settings = testutils::user_settings();
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let mut tx = setup.jj_repo.start_transaction(&settings);
let targets = GitBranchPushTargets { let targets = GitBranchPushTargets {
branch_updates: vec![( branch_updates: vec![(
"main".to_owned(), "main".to_owned(),