From eb11989de141e95ed3f4406a0c4a2d0357ec5279 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Thu, 21 Jul 2016 04:11:35 -0700 Subject: [PATCH] Use git2::Tree::get_id to find tree entries by Oid --- src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index dcee306f1b0f2d4b7f23531b9a970fdf00c41ad6..9610cf5164b192a1e858f2977d33fd182bf18612 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1212,7 +1212,7 @@ fn log(out: &mut Output, repo: &Repository, m: &ArgMatches) -> Result<()> { let commit = try!(repo.find_commit(oid)); let tree = try!(commit.tree()); for parent_id in commit.parent_ids() { - if tree.iter().find(|entry| entry.id() == parent_id).is_some() { + if tree.get_id(parent_id).is_some() { try!(revwalk.hide(parent_id)); hidden_ids.insert(parent_id); } @@ -1248,7 +1248,7 @@ fn log(out: &mut Output, repo: &Repository, m: &ArgMatches) -> Result<()> { if show_diff { let tree = try!(commit.tree()); - let parent_ids: Vec<_> = commit.parent_ids().take_while(|parent_id| tree.iter().find(|entry| &entry.id() == parent_id).is_none()).collect(); + let parent_ids: Vec<_> = commit.parent_ids().take_while(|parent_id| tree.get_id(*parent_id).is_none()).collect(); try!(writeln!(out, "")); if parent_ids.len() > 1 {