Fix jj-vcs#2476, change ids

ilyagr · Jun 28, 2024 · c0c9441 · c0c9441
1 parent e21e5e6
commit c0c9441
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/src/id_prefix.rs b/lib/src/id_prefix.rs
@@ -168,13 +168,16 @@ impl IdPrefixContext {
         prefix: &HexPrefix,
     ) -> PrefixResolution<Vec<CommitId>> {
         if let Some(indexes) = self.disambiguation_indexes(repo) {
-            let resolution = indexes.change_index.resolve_prefix_with(
-                &*indexes.commit_change_ids,
-                prefix,
-                |(commit_id, _)| commit_id.clone(),
-            );
-            if let PrefixResolution::SingleMatch((_, ids)) = resolution {
-                return PrefixResolution::SingleMatch(ids);
+            let resolution: PrefixResolution<(ChangeId, Vec<CommitId>)> = indexes
+                .change_index
+                .resolve_prefix_with(&*indexes.commit_change_ids, prefix, |(commit_id, _)| {
+                    commit_id.clone()
+                });
+            if let PrefixResolution::SingleMatch((change_id, _ids)) = resolution {
+                // There may be more commits with this change id outside the narrower sets.
+                return PrefixResolution::SingleMatch(repo.resolve_change_id(&change_id).expect(
+                    "Change ids present in narrower search set should be present globally.",
+                ));
             }
         }
         repo.resolve_change_id_prefix(prefix)