cli: when restoring to a previous operation, don't roll back git_refs

src/commands/operation.rs

···
 use clap::Subcommand;
 use jujutsu_lib::operation;
+use jujutsu_lib::repo::Repo;
 
 use crate::cli_util::{user_error, CommandError, CommandHelper, LogContentFormat};
 use crate::graphlog::{get_graphlog, Edge};
···
     let bad_repo = repo_loader.load_at(&bad_op);
     let parent_repo = repo_loader.load_at(&parent_ops[0]);
     tx.mut_repo().merge(&bad_repo, &parent_repo);
+    let mut new_view = tx.repo().view().store_view().clone();
+    new_view.git_refs = tx.base_repo().view().store_view().git_refs.clone();
+    tx.mut_repo().set_view(new_view);
     tx.finish(ui)?;
 
     Ok(())
···
     let mut tx = workspace_command
         .start_transaction(&format!("restore to operation {}", target_op.id().hex()));
     tx.mut_repo().set_view(target_op.view().take_store_view());
+    let mut new_view = tx.repo().view().store_view().clone();
+    new_view.git_refs = tx.base_repo().view().store_view().git_refs.clone();
+    tx.mut_repo().set_view(new_view);
     tx.finish(ui)?;
 
     Ok(())

tests/test_git_colocated.rs

···
     ◉  zzzzzzzzzzzz 000000000000
     "###);
     test_env.jj_cmd_success(&repo_path, &["undo"]);
-    // TODO: There should be no divergence here; 2f376ea1478c should be hidden
-    // (#922)
+    // There should be no divergence here; 2f376ea1478c should be hidden
     insta::assert_snapshot!(get_log_output_divergence(&test_env, &repo_path), @r###"
-    ◉  qpvuntsmwlqt 2f376ea1478c A master !divergence!
-    │ @  rlvkpnrzqnoo 8f71e3b6a3be
-    │ ◉  qpvuntsmwlqt a86754f975f9 A HEAD@git !divergence!
-    ├─╯
+    @  rlvkpnrzqnoo 8f71e3b6a3be
+    ◉  qpvuntsmwlqt a86754f975f9 A master HEAD@git
     ◉  zzzzzzzzzzzz 000000000000
     "###);
 }

tests/test_git_fetch.rs

···
     "###);
     // Now try to fetch just one branch
     let stdout = test_env.jj_cmd_success(&target_jj_repo_path, &["git", "fetch", "--branch", "b"]);
-    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stdout, @r###"
+    Nothing changed.
+    "###);
     insta::assert_snapshot!(get_log_output(&test_env, &target_jj_repo_path), @r###"
-    ◉  c7d4bdcbc215 descr_for_b b
-    ◉  ff36dc55760e descr_for_trunk1
-    │ @  230dd059e1b0
-    ├─╯
+    @  230dd059e1b0
     ◉  000000000000
     "###);
 }

tests/test_git_import_export.rs

···
 
     // "git export" can't be undone.
     insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "undo"]), @r###"
+    Nothing changed.
     "###);
     insta::assert_debug_snapshot!(get_git_refs(&git_repo), @r###"
     [
···
 
     // This would re-export branch "a" as the internal state has been rolled back.
     // It might be better to preserve the state, and say "Nothing changed" here.
-    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["git", "export"]), @"");
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["git", "export"]), @r###"
+    Nothing changed.
+    "###);
 }
 
 #[test]
···
     insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @"");
 
     // Try "git import" again, which should re-import the branch "a".
-    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["git", "import"]), @"");
-    insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
-    a: 230dd059e1b0 (no description set)
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["git", "import"]), @r###"
+    Nothing changed.
     "###);
+    insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @"");
 }
 
 #[test]
···
 
     // The last branch "a" state is imported from git. No idea what's the most
     // intuitive result here.
-    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["git", "import"]), @"");
-    insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
-    a: 096dc80da670 (no description set)
+    insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["git", "import"]), @r###"
+    Nothing changed.
     "###);
+    insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @"");
 }
 
 #[test]
···
     test_env.jj_cmd_success(&repo_path, &["undo"]);
     test_env.jj_cmd_success(&repo_path, &["describe", "-m", "v3"]);
     test_env.jj_cmd_success(&repo_path, &["git", "fetch"]);
-    // TODO: This should probably not be considered a conflict. It currently is
-    // because the undo made us forget that the remote was at v2, so the fetch
-    // made us think it updated from v1 to v2 (instead of the no-op it could
-    // have been).
+    // There should be no conflict
     insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
-    main (conflicted):
-      - 367d4f2f6deb v1
-      + cb20e76758a0 v3
-      + ebba8fecca7e v2
-      @origin (behind by 1 commits): ebba8fecca7e v2
+    main: cb20e76758a0 v3
+      @origin (ahead by 1 commits, behind by 1 commits): 367d4f2f6deb v1
     "###);
 }