From 9e910646a5c60007f10e8ea69a7120d50b4868e7 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Thu, 17 Sep 2020 01:33:27 +0200 Subject: main.rs: Fix ref parsing Turns out `refname_to_id()` wasn't the right function to get a reference/oid/object from a ref name. Use `revparse_single()` instead to get a usable reference object. Add a test for custom diff bases. --- src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 780ab62..4d810b0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -44,15 +44,15 @@ fn main() { // TODO: error if more than one ref given let refname = &matches.free[0]; - let oid = match repo.refname_to_id(&refname) { - Ok(oid) => oid, + let object = match repo.revparse_single(&refname) { + Ok(object) => object, Err(e) => { eprintln(&e); process::exit(exitcode::USAGE); }, }; - match repo.find_tree(oid) { + match object.peel_to_tree() { Ok(t) => t, Err(e) => { eprintln(&e); -- cgit v1.2.3