From 9826a03e62a28343b57bfa36258821b6681516cd Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sun, 12 May 2024 21:17:03 -0700 Subject: [PATCH] test_git.rs: delete now-useless test --- lib/tests/test_git.rs | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs index 5ee8d66d97..b730b8644a 100644 --- a/lib/tests/test_git.rs +++ b/lib/tests/test_git.rs @@ -2721,34 +2721,6 @@ fn test_push_branches_not_fast_forward() { let setup = set_up_push_repos(&settings, &temp_dir); 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 { branch_updates: vec![( "main".to_owned(),