address auto-review

Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>

Author: codex

gix/src/object/tree/mod.rs

@@ -103,13 +103,15 @@ impl<'repo> Tree<'repo> {
     {
         let mut iter = path.into_iter().peekable();
         let mut data = gix_object::Data::new(gix_object::Kind::Tree, &self.data);
+        let mut data_id = self.id;
 
         loop {
             data = match next_entry(&mut iter, data) {
                 ControlFlow::Continue(id) => {
                     let res = self.repo.find(&id, &mut self.data)?;
+                    data_id = id;
                     if res.kind.is_tree() {
-                        self.id = id;
+                        self.id = data_id;
                     }
                     res
                 }
@@ -120,9 +122,16 @@ impl<'repo> Tree<'repo> {
                     });
                     if let Some(entry) = &mapped {
                         if entry.mode().is_tree() {
-                            self.id = entry.object_id();
+                            let id = entry.object_id();
+                            self.repo.find(&id, &mut self.data)?;
+                            data_id = id;
+                            self.id = data_id;
                         }
                     }
+                    if data_id != self.id {
+                        // Ensure that our data always matches our id, even if this means an extra lookup.
+                        self.repo.find(&self.id, &mut self.data)?;
+                    }
                     break Ok(mapped);
                 }
             }

gix/tests/gix/object/tree/mod.rs

@@ -62,6 +62,11 @@ mod peel_to_entry {
 
         assert!(entry.mode().is_tree());
         assert_eq!(tree.id(), dir_id);
+        assert_eq!(
+            tree.find_entry("c").expect("subtree entry").filename(),
+            "c",
+            "the data matches the id"
+        );
         Ok(())
     }
 
@@ -101,6 +106,11 @@ mod peel_to_entry {
 
         assert!(entry.is_none());
         assert_eq!(tree.id(), root_id);
+        assert_eq!(
+            tree.find_entry("dir").expect("root tree entry").filename(),
+            "dir",
+            "the data matches the id"
+        );
         Ok(())
     }
 
@@ -114,6 +124,11 @@ mod peel_to_entry {
 
         assert!(entry.is_none());
         assert_eq!(tree.id(), dir_id);
+        assert_eq!(
+            tree.find_entry("c").expect("nested tree entry").filename(),
+            "c",
+            "the data matches the id"
+        );
         Ok(())
     }