diff --git a/lib/src/revset.rs b/lib/src/revset.rs index d788b6fb5..378038c78 100644 --- a/lib/src/revset.rs +++ b/lib/src/revset.rs @@ -1792,7 +1792,8 @@ impl SymbolResolver for DefaultSymbolResolver<'_> { Err(RevsetResolutionError::EmptyString) } else { // Try to resolve as a tag - if let Some(target) = self.repo.view().tags().get(symbol) { + let target = self.repo.view().get_tag(symbol); + if target.is_present() { return Ok(target.added_ids().cloned().collect()); } diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs index 31dc23b44..37050ec20 100644 --- a/lib/tests/test_git.rs +++ b/lib/tests/test_git.rs @@ -27,7 +27,7 @@ use jj_lib::commit_builder::CommitBuilder; use jj_lib::git; use jj_lib::git::{GitFetchError, GitPushError, GitRefUpdate, SubmoduleConfig}; use jj_lib::git_backend::GitBackend; -use jj_lib::op_store::{BranchTarget, RefTarget, RefTargetMap, RefTargetOptionExt as _}; +use jj_lib::op_store::{BranchTarget, RefTarget, RefTargetMap}; use jj_lib::repo::{MutableRepo, ReadonlyRepo, Repo}; use jj_lib::settings::{GitSettings, UserSettings}; use jj_lib::view::RefName; @@ -142,10 +142,7 @@ fn test_import_refs() { Some(expected_feature3_branch).as_ref() ); - assert_eq!( - view.tags().get("v1.0").flatten(), - &RefTarget::normal(jj_id(&commit5)) - ); + assert_eq!(view.get_tag("v1.0"), &RefTarget::normal(jj_id(&commit5))); assert_eq!(view.git_refs().len(), 6); assert_eq!(