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.7 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 360CC201A8 for ; Mon, 20 Feb 2017 00:11:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752078AbdBTALM (ORCPT ); Sun, 19 Feb 2017 19:11:12 -0500 Received: from castro.crustytoothpaste.net ([75.10.60.170]:36356 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbdBTAKy (ORCPT ); Sun, 19 Feb 2017 19:10:54 -0500 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 61880280BF; Mon, 20 Feb 2017 00:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1487549448; bh=5jj4CKZto4kN7x4tIM92UdyOELib38nihb+opUMfge4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NT3ikX0MgdaxOdQA9rk99gYFBemOB27MTrMun3tDFebaQjVp/qt5fkTQvI2n7Jvar CETV7Z5IgcRqnEryjjLHcFA3SOmywelHrowlCpjzBpOEep1orqWgODUClnsIxA5sl3 0FSy1dfLnwfoFuzeYCaTDV69FOrKNVCUtRpzxYIMTSKqTlwnv/f3eaKNThcYaJ66yb JriJkN/O06jbmpOqyKutjs0xAjiik06RKdzn71xrz7YLuBFHnPRgyrxLy+FoEPywD2 pNjxiROy86IbV/2uhvsuP+D4+58mN30WlezWB8vhFOqH5Xx5WW5cbE8rTb+xufCVzk HkIy9HFxaKS1r8htUtCY171LeEdJ0nDw5o+OEVloJ5ygFzTKGgfF0IDKKdWGlJAcvZ 5m60eU4v9EPlWXDrGY6khcc0z2dRiq0rQsj/xwX01TxCHrgKE+ZGLTv8RZF0HB5T6c ajRM2A98N7iL8OuK5whmHfuu/p3jumZlyJZQNywJLVSvr+4uuM2 From: "brian m. carlson" To: git@vger.kernel.org Cc: Jeff King , Michael Haggerty , Junio C Hamano , Ramsay Jones Subject: [PATCH v4 18/19] builtin/merge-base: convert to struct object_id Date: Mon, 20 Feb 2017 00:10:30 +0000 Message-Id: <20170220001031.559931-19-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170220001031.559931-1-sandals@crustytoothpaste.net> References: <20170220001031.559931-1-sandals@crustytoothpaste.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Convert the remaining uses of unsigned char [20] to struct object_id. Signed-off-by: brian m. carlson --- builtin/merge-base.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/merge-base.c b/builtin/merge-base.c index db95bc29cf..cfe2a796f8 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -36,12 +36,12 @@ static const char * const merge_base_usage[] = { static struct commit *get_commit_reference(const char *arg) { - unsigned char revkey[20]; + struct object_id revkey; struct commit *r; - if (get_sha1(arg, revkey)) + if (get_oid(arg, &revkey)) die("Not a valid object name %s", arg); - r = lookup_commit_reference(revkey); + r = lookup_commit_reference(revkey.hash); if (!r) die("Not a valid commit name %s", arg); @@ -113,14 +113,14 @@ struct rev_collect { unsigned int initial : 1; }; -static void add_one_commit(unsigned char *sha1, struct rev_collect *revs) +static void add_one_commit(struct object_id *oid, struct rev_collect *revs) { struct commit *commit; - if (is_null_sha1(sha1)) + if (is_null_oid(oid)) return; - commit = lookup_commit(sha1); + commit = lookup_commit(oid->hash); if (!commit || (commit->object.flags & TMP_MARK) || parse_commit(commit)) @@ -139,15 +139,15 @@ static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid if (revs->initial) { revs->initial = 0; - add_one_commit(ooid->hash, revs); + add_one_commit(ooid, revs); } - add_one_commit(noid->hash, revs); + add_one_commit(noid, revs); return 0; } static int handle_fork_point(int argc, const char **argv) { - unsigned char sha1[20]; + struct object_id oid; char *refname; const char *commitname; struct rev_collect revs; @@ -155,7 +155,7 @@ static int handle_fork_point(int argc, const char **argv) struct commit_list *bases; int i, ret = 0; - switch (dwim_ref(argv[0], strlen(argv[0]), sha1, &refname)) { + switch (dwim_ref(argv[0], strlen(argv[0]), oid.hash, &refname)) { case 0: die("No such ref: '%s'", argv[0]); case 1: @@ -165,16 +165,16 @@ static int handle_fork_point(int argc, const char **argv) } commitname = (argc == 2) ? argv[1] : "HEAD"; - if (get_sha1(commitname, sha1)) + if (get_oid(commitname, &oid)) die("Not a valid object name: '%s'", commitname); - derived = lookup_commit_reference(sha1); + derived = lookup_commit_reference(oid.hash); memset(&revs, 0, sizeof(revs)); revs.initial = 1; for_each_reflog_ent(refname, collect_one_reflog_ent, &revs); - if (!revs.nr && !get_sha1(refname, sha1)) - add_one_commit(sha1, &revs); + if (!revs.nr && !get_oid(refname, &oid)) + add_one_commit(&oid, &revs); for (i = 0; i < revs.nr; i++) revs.commit[i]->object.flags &= ~TMP_MARK; -- 2.11.0