From 0a51c5fc2e3e31163acd8e295266864228f291db Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Wed, 10 May 2023 20:31:57 -0700 Subject: [PATCH] `test_git_colocated_fetch_deleted_branch`: Fix the test Before, HEAD@git was at change `e1f4` mentioned in the test. So, as long as we consider the behavior added in 20eb9ec to be correct, that change should NOT have been abandoned after the fetch, in spite of what the comment in the test says. In other words, the test did NOT demonstrate a bug before this commit. Now, the test properly demonstrates the bug. Cc #864 --- tests/test_git_colocated.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/test_git_colocated.rs b/tests/test_git_colocated.rs index 13b674c98..4f46969a3 100644 --- a/tests/test_git_colocated.rs +++ b/tests/test_git_colocated.rs @@ -248,10 +248,12 @@ fn test_git_colocated_fetch_deleted_branch() { let clone_path = test_env.env_root().join("clone"); git2::Repository::clone(origin_path.to_str().unwrap(), &clone_path).unwrap(); test_env.jj_cmd_success(&clone_path, &["init", "--git-repo=."]); + test_env.jj_cmd_success(&clone_path, &["new", "A"]); insta::assert_snapshot!(get_log_output(&test_env, &clone_path), @r###" - @ bc7d08e8de9b7bc248b9358a05e96f1671bbd4d9 - ◉ e1f4268fabd2c84e880c5eb5bd87e076180fc8e3 B HEAD@git - ◉ a86754f975f953fa25da4265764adc0c62e9ce6b A master + @ 1fa8b2e27c8c3da9764bda953dd81a06fb292d1a + │ ◉ e1f4268fabd2c84e880c5eb5bd87e076180fc8e3 B + ├─╯ + ◉ a86754f975f953fa25da4265764adc0c62e9ce6b A master HEAD@git ◉ 0000000000000000000000000000000000000000 "###); @@ -260,9 +262,10 @@ fn test_git_colocated_fetch_deleted_branch() { insta::assert_snapshot!(stdout, @""); // TODO: e1f4 should have been abandoned (#864) insta::assert_snapshot!(get_log_output(&test_env, &clone_path), @r###" - @ bc7d08e8de9b7bc248b9358a05e96f1671bbd4d9 - ◉ e1f4268fabd2c84e880c5eb5bd87e076180fc8e3 HEAD@git - ◉ a86754f975f953fa25da4265764adc0c62e9ce6b A master + @ 1fa8b2e27c8c3da9764bda953dd81a06fb292d1a + │ ◉ e1f4268fabd2c84e880c5eb5bd87e076180fc8e3 + ├─╯ + ◉ a86754f975f953fa25da4265764adc0c62e9ce6b A master HEAD@git ◉ 0000000000000000000000000000000000000000 "###); }