From 1d6c93817bf22d6bf279bac302911cc93f63046c Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 19 May 2017 08:48:46 -0400 Subject: [PATCH] handle_revision_arg: simplify commit reference lookups The "dotdot" range parser avoids calling lookup_commit_reference() if we are directly fed two commits. But its casts are unnecessarily complex; that function will just return a commit we pass into it. Just calling the function all the time is much simpler, and doesn't do any significant extra work (the object is already parsed, and deref_tag() on a non-tag is a noop; we do incur one extra lookup_object() call, but that's fairly trivial). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- revision.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/revision.c b/revision.c index 2bcd60a2bb..dc32812906 100644 --- a/revision.c +++ b/revision.c @@ -1500,12 +1500,8 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi struct commit *a, *b; struct commit_list *exclude; - a = (a_obj->type == OBJ_COMMIT - ? (struct commit *)a_obj - : lookup_commit_reference(a_obj->oid.hash)); - b = (b_obj->type == OBJ_COMMIT - ? (struct commit *)b_obj - : lookup_commit_reference(b_obj->oid.hash)); + a = lookup_commit_reference(a_obj->oid.hash); + b = lookup_commit_reference(b_obj->oid.hash); if (!a || !b) goto missing; exclude = get_merge_bases(a, b); -- 2.47.1