Skip to content

UPSTREAM PR #2492: Refactor tree::peel_to_entry to make the intent more obvious #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loci-dev wants to merge 2 commits into
base: main
Choose a base branch
from
Open

UPSTREAM PR #2492: Refactor tree::peel_to_entry to make the intent more obvious #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18d209b
misc(tree/peel_to_entry): remove confusing map()
datdenkikniet Mar 26, 2026
cb7d088
misc(tree/peel_to_entry): rework logic to reflect intent more clearly
datdenkikniet Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions gix/src/object/tree/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,36 +116,41 @@ 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;
let mut last_tree_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;
self.id = id;

if res.kind.is_tree() {
self.id = data_id;
last_tree_id = id;
}

res
}
ControlFlow::Break(entry) => {
let mapped = entry.map(|e| Entry {
inner: e.into(),
repo: self.repo,
});
if let Some(entry) = &mapped {
if entry.mode().is_tree() {
let id = entry.object_id();
self.repo.find(&id, &mut self.data)?;
data_id = id;
self.id = data_id;
let entry = if let Some(e) = entry {
if e.mode.is_tree() {
last_tree_id = e.oid.to_owned();
}
Some(Entry {
inner: e.into(),
repo: self.repo,
})
} else {
None
};

if self.id != last_tree_id {
// Ensure that our data & ID alway match the last seen tree so that
// this tree can be reused, even if this means an extra lookup.
self.repo.find(&last_tree_id, &mut self.data)?;
self.id = last_tree_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);

break Ok(entry);
}
}
}
Expand Down
Loading