revset: drop support for HEAD@git symbol resolution

CHANGELOG.md

@@ -15,6 +15,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 * Evaluation error of `revsets.short-prefixes` configuration is now reported.
 
+* The `HEAD@git` symbol no longer resolves to the Git HEAD revision. Use
+  `git_head()` or `@-` revset expression instead. The `git_head` template
+  keyword now returns a boolean.
+
 * Help command doesn't work recursively anymore, i.e. `jj workspace help root`
   doesn't work anymore.
 

cli/src/commands/git/import.rs

@@ -33,7 +33,7 @@ pub fn cmd_git_import(
 ) -> Result<(), CommandError> {
     let mut workspace_command = command.workspace_helper(ui)?;
     let mut tx = workspace_command.start_transaction();
-    // In non-colocated repo, HEAD@git will never be moved internally by jj.
+    // In non-colocated repo, Git HEAD will never be moved internally by jj.
     // That's why cmd_git_export() doesn't export the HEAD ref.
     git::import_head(tx.repo_mut())?;
     let stats = git::import_refs(tx.repo_mut(), &command.settings().git_settings())?;

cli/src/commit_templater.rs

@@ -30,7 +30,6 @@ use jj_lib::extensions_map::ExtensionsMap;
 use jj_lib::fileset;
 use jj_lib::fileset::FilesetDiagnostics;
 use jj_lib::fileset::FilesetExpression;
-use jj_lib::git;
 use jj_lib::id_prefix::IdPrefixContext;
 use jj_lib::id_prefix::IdPrefixIndex;
 use jj_lib::matchers::Matcher;
@@ -703,8 +702,11 @@ fn builtin_commit_methods<'repo>() -> CommitTemplateBuildMethodFnMap<'repo, Comm
         |language, _diagnostics, _build_ctx, self_property, function| {
             function.expect_no_arguments()?;
             let repo = language.repo;
-            let out_property = self_property.map(|commit| extract_git_head(repo, &commit));
-            Ok(L::wrap_ref_name_opt(out_property))
+            let out_property = self_property.map(|commit| {
+                let target = repo.view().git_head();
+                target.added_ids().contains(commit.id())
+            });
+            Ok(L::wrap_boolean(out_property))
         },
     );
     map.insert(
@@ -1230,14 +1232,6 @@ fn build_ref_names_index<'a>(
     index
 }
 
-fn extract_git_head(repo: &dyn Repo, commit: &Commit) -> Option<Rc<RefName>> {
-    let target = repo.view().git_head();
-    target
-        .added_ids()
-        .contains(commit.id())
-        .then(|| RefName::remote_only("HEAD", git::REMOTE_NAME_FOR_LOCAL_GIT_REPO, target.clone()))
-}
-
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum CommitOrChangeId {
     Commit(CommitId),

cli/src/config/templates.toml

@@ -78,7 +78,7 @@ if(root,
         bookmarks,
         tags,
         working_copies,
-        git_head,
+        if(git_head, label("git_head", "git_head()")),
         format_short_commit_id(commit_id),
         if(conflict, label("conflict", "conflict")),
         if(empty, label("empty", "(empty)")),
@@ -103,7 +103,7 @@ if(root,
         bookmarks,
         tags,
         working_copies,
-        git_head,
+        if(git_head, label("git_head", "git_head()")),
         format_short_commit_id(commit_id),
         if(conflict, label("conflict", "conflict")),
       ) ++ "\n",

cli/tests/test_commit_template.rs

@@ -671,27 +671,21 @@ fn test_log_git_head() {
     test_env.jj_cmd_ok(&repo_path, &["new", "-m=initial"]);
     std::fs::write(repo_path.join("file"), "foo\n").unwrap();
 
-    let template = r#"
-    separate(", ",
-      if(git_head, "name: " ++ git_head.name()),
-      "remote: " ++ git_head.remote(),
-    ) ++ "\n"
-    "#;
-    let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", template]);
-    insta::assert_snapshot!(stdout, @r###"
-    @  remote: <Error: No RefName available>
-    ○  name: HEAD, remote: git
-    ◆  remote: <Error: No RefName available>
-    "###);
+    let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "git_head"]);
+    insta::assert_snapshot!(stdout, @r#"
+    @  false
+    ○  true
+    ◆  false
+    "#);
 
     let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
-    insta::assert_snapshot!(stdout, @r###"
+    insta::assert_snapshot!(stdout, @r#"
     @  rlvkpnrz [38;5;[email protected] 2001-02-03 08:05:09 50aaf475
     │  initial
-    ○  qpvuntsm [38;5;[email protected] 2001-02-03 08:05:07 HEAD@git 230dd059
+    ○  qpvuntsm [38;5;[email protected] 2001-02-03 08:05:07 git_head() 230dd059
     │  (empty) (no description set)
     ◆  zzzzzzzz root() 00000000
-    "###);
+    "#);
 }
 
 #[test]