From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 938C4207F8 for ; Sat, 6 May 2017 22:11:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754610AbdEFWLq (ORCPT ); Sat, 6 May 2017 18:11:46 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:37750 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754190AbdEFWLM (ORCPT ); Sat, 6 May 2017 18:11:12 -0400 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:254c:7dd1:74c7:cde0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by castro.crustytoothpaste.net (Postfix) with ESMTPSA id B85E4280AD; Sat, 6 May 2017 22:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1494108668; bh=DEalbvUfEv9wR64g4yn6ao9f8h3PmvYLwd/JEo9p9wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V2fuTHF5Jv+pMA9wYmvI7ck5zPkhLIJ2sRZU3dSgjGi6MpiqLIkmiPvkfIrQDUbRN B0X2TjSZcNOmLqwif59nfeG761gKXevwuOeDdsDLx1FLBVEfMzLnSe3kCj9+P1rOYx FkZPcj7SqDbssqKSDmLYXRQdS9yRrskwTXjK6CLz4dvVsPjkGezeLA4CCGUpSsZwGv 0noanWaf/YwL5gPka8zMWMimUxrVOo8DaD9S/pokY4nbPeLbejuwt5JEKv8xG27b5w jp8IVhT7DEjbn3JuL00rYPmGdzv48xx8EV6PX33s5Ycxkj5zx230km3Xzm1exVdtAO YauDOyoc6zf161N26VdlB2yuk1Jd9RTouRFCP4Ty8L342imtExJ/2C1/MdkXiFWMrG ewmm/W5jDfdbtjdVki778mFA0eDV46EN1zTK3pylm+pE1O6aZpI3v4oKqDWZoIlQKb mgXAXac+gjCfWMDzhTMGzWwJB4fzexpi/Ug67PjYFSq1uKGEYZe From: "brian m. carlson" To: git@vger.kernel.org Cc: Michael Haggerty , Jonathan Tan , Stefan Beller , Jeff King , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Brandon Williams Subject: [PATCH v3 14/53] parse-options-cb: convert to struct object_id Date: Sat, 6 May 2017 22:09:59 +0000 Message-Id: <20170506221038.296722-15-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.13.0.rc1.294.g07d810a77f In-Reply-To: <20170506221038.296722-1-sandals@crustytoothpaste.net> References: <20170506221038.296722-1-sandals@crustytoothpaste.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is a caller of lookup_commit_reference, which we will soon convert. Signed-off-by: brian m. carlson --- parse-options-cb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parse-options-cb.c b/parse-options-cb.c index 7419780a9..35a941fdd 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -80,14 +80,14 @@ int parse_opt_verbosity_cb(const struct option *opt, const char *arg, int parse_opt_commits(const struct option *opt, const char *arg, int unset) { - unsigned char sha1[20]; + struct object_id oid; struct commit *commit; if (!arg) return -1; - if (get_sha1(arg, sha1)) + if (get_oid(arg, &oid)) return error("malformed object name %s", arg); - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(oid.hash); if (!commit) return error("no such commit %s", arg); commit_list_insert(commit, opt->value);