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.4 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 B5739207BD for ; Sun, 23 Apr 2017 21:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1046150AbdDWVhq (ORCPT ); Sun, 23 Apr 2017 17:37:46 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:37320 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1046151AbdDWVf5 (ORCPT ); Sun, 23 Apr 2017 17:35:57 -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 1CFB7280D5; Sun, 23 Apr 2017 21:35:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1492983341; bh=1ux7Cm8BGbuGriadKJFBoR5juyA5+1Nn8TKIpGKd0Ys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h7U5FwsGWb1Ezb2b32HF/Tz/AlSRtvtjG/77o1iiKfw0K0BTaPZn4ue7DcOXMdZWg nKZ6KaVLnLEBBXkGQEIZ+u4Me5T6wsZ6YrtrTwwRe+vWBGrqPsx9D4PZ25JzUdskgA m39PpzFCVeRIJmlInV/8AGIXsvfXf73exKPcmVD0Xy6M8VP7srxDalFG8ZSlq8Y+ks FyZEveA0uEnhw3ZpR9XFEVnl0T0HM/Hx4WRz7lXD3h4jxDm1zG/DoIwp+kFqhiuoVg v1UIdpFU7JUv7rsDokW5+mN0OPUqqgMuoT9sGj5FYzpxanJNm5+GvLnsPB5mNdGpIT xE8Y0MiIJ4aHSE79h4laPQ71bvs2Nw0RF/ywl+eUwLhPvDDmg6nTxnD8grOuNKeLPX CpelQ2dcZaWp5vXQdGEbGdShSmzGKAPoGaYW9dJceoXhQUTF9g217wPxNlHp+391hX 34Vj0s/2QElbn/uwOsjrwe/oYMxVKKyN8wxtB4c+JGyamFEY0MS From: "brian m. carlson" To: git@vger.kernel.org Cc: Michael Haggerty , Jeff King , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 41/53] revision: rename add_pending_sha1 to add_pending_oid Date: Sun, 23 Apr 2017 21:34:41 +0000 Message-Id: <20170423213453.253425-42-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.12.2.762.g0e3151a226 In-Reply-To: <20170423213453.253425-1-sandals@crustytoothpaste.net> References: <20170423213453.253425-1-sandals@crustytoothpaste.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Rename this function and convert it to take a pointer to struct object_id. This is a prerequisite for converting get_reference, which is needed to convert parse_object. Signed-off-by: brian m. carlson --- builtin/am.c | 2 +- builtin/checkout.c | 4 ++-- revision.c | 8 ++++---- revision.h | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index e12da7b3f..46828646c 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1622,7 +1622,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa init_revisions(&rev_info, NULL); rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS; diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix); - add_pending_sha1(&rev_info, "HEAD", our_tree.hash, 0); + add_pending_oid(&rev_info, "HEAD", &our_tree, 0); diff_setup_done(&rev_info.diffopt); run_diff_index(&rev_info, 1); } diff --git a/builtin/checkout.c b/builtin/checkout.c index afa99fb8a..7f1eeea94 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -721,7 +721,7 @@ static int add_pending_uninteresting_ref(const char *refname, const struct object_id *oid, int flags, void *cb_data) { - add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING); + add_pending_oid(cb_data, refname, oid, UNINTERESTING); return 0; } @@ -807,7 +807,7 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new) add_pending_object(&revs, object, oid_to_hex(&object->oid)); for_each_ref(add_pending_uninteresting_ref, &revs); - add_pending_sha1(&revs, "HEAD", new->object.oid.hash, UNINTERESTING); + add_pending_oid(&revs, "HEAD", &new->object.oid, UNINTERESTING); refs = revs.pending; revs.leak_pending = 1; diff --git a/revision.c b/revision.c index c2091b6de..f82c56e1f 100644 --- a/revision.c +++ b/revision.c @@ -203,10 +203,10 @@ static struct object *get_reference(struct rev_info *revs, const char *name, return object; } -void add_pending_sha1(struct rev_info *revs, const char *name, - const unsigned char *sha1, unsigned int flags) +void add_pending_oid(struct rev_info *revs, const char *name, + const struct object_id *oid, unsigned int flags) { - struct object *object = get_reference(revs, name, sha1, flags); + struct object *object = get_reference(revs, name, oid->hash, flags); add_pending_object(revs, object, name); } @@ -1159,7 +1159,7 @@ static int handle_one_ref(const char *path, const struct object_id *oid, object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags); add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags); - add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags); + add_pending_oid(cb->all_revs, path, oid, cb->all_flags); return 0; } diff --git a/revision.h b/revision.h index 14886ec92..728425a02 100644 --- a/revision.h +++ b/revision.h @@ -263,9 +263,9 @@ extern void show_object_with_name(FILE *, struct object *, const char *); extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name); -extern void add_pending_sha1(struct rev_info *revs, - const char *name, const unsigned char *sha1, - unsigned int flags); +extern void add_pending_oid(struct rev_info *revs, + const char *name, const struct object_id *oid, + unsigned int flags); extern void add_head_to_pending(struct rev_info *); extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags);