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

templater: use "git" constant to build HEAD@git ref name

Browse source
This commit is contained in:
Yuya Nishihara 2023-10-25 18:00:47 +09:00
parent 01d474563e
commit 817ca7f667
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/src/commit_templater.rs
View file

@ -24,7 +24,7 @@ use jj_lib::hex_util::to_reverse_hex;
use jj_lib::id_prefix::IdPrefixContext; use jj_lib::id_prefix::IdPrefixContext;
use jj_lib::op_store::{RefTarget, WorkspaceId}; use jj_lib::op_store::{RefTarget, WorkspaceId};
use jj_lib::repo::Repo; use jj_lib::repo::Repo;
use jj_lib::rewrite; use jj_lib::{git, rewrite};
use once_cell::unsync::OnceCell; use once_cell::unsync::OnceCell;
use crate::formatter::Formatter; use crate::formatter::Formatter;
@ -515,7 +515,7 @@ fn extract_git_head(repo: &dyn Repo, commit: &Commit) -> Vec<RefName> {
if target.added_ids().contains(commit.id()) { if target.added_ids().contains(commit.id()) {
let ref_name = RefName { let ref_name = RefName {
name: "HEAD".to_owned(), name: "HEAD".to_owned(),
remote: Some("git".to_owned()), remote: Some(git::REMOTE_NAME_FOR_LOCAL_GIT_REPO.to_owned()),
conflict: target.has_conflict(), conflict: target.has_conflict(),
synced: false, // has no local counterpart synced: false, // has no local counterpart
}; };