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=-1.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNWANTED_LANGUAGE_BODY 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 1FF83207F8 for ; Sat, 6 May 2017 22:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754853AbdEFWMa (ORCPT ); Sat, 6 May 2017 18:12:30 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:37748 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754429AbdEFWLY (ORCPT ); Sat, 6 May 2017 18:11:24 -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 7B54A280CA; Sat, 6 May 2017 22:11:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1494108674; bh=Ala30MPA6e330s5G28DVtX/kNIPXNyAwCgm3dlbL3D4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WG0HQ5KEHVsyBTtz+uSHWThJ5+r3CfraGUlMjWT9Qyz6zxMWphGuOWF11/BnjEtWw 7RlkeFge7FqEn3/oYWvgdNDo6PnK+8/EPEu+PRrDUpsZr1srA8zG6GJ3MyvzRQkAHm oaJjTzMi/LStQxPR5gmNA/yxW6hgircCeW7/Y/csyDoltDoIUemH/a7E93GZmkBt9v 3shJ2jd+xiWd53QlPGYe8Gxy070C4Wo2a8wCLeiRztPk6ashoIFJN14Wil8IDXNgAr DarCVWsqTXNZtwle8cKuAdZ3guFhG/VoGptPp8g0nLsPdpD8KNzyarvzToNtvRMvpm CHPxR2NTQ81eYVbNfH0JL0+hffzyDXDc5FE3TArlPKowXsreQYAMeiUEKd6WglY9er Ilt1vJ1D9YPlRs51iIowqAsC0k4qdLZC0qrSf7/Y4IQWcOG9nCR70YbLXyWYjrCu+k JAuj8wXeGX+Oe7jjaT7n7GmLCjpfWc2k0kU6zvPYoblfhXNrbS/ 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 31/53] builtin/reflog: convert tree_is_complete to take struct object_id Date: Sat, 6 May 2017 22:10:16 +0000 Message-Id: <20170506221038.296722-32-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 Signed-off-by: brian m. carlson --- builtin/reflog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/reflog.c b/builtin/reflog.c index 4831116ea..7866a0341 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -55,14 +55,14 @@ struct collect_reflog_cb { #define STUDYING (1u<<11) #define REACHABLE (1u<<12) -static int tree_is_complete(const unsigned char *sha1) +static int tree_is_complete(const struct object_id *oid) { struct tree_desc desc; struct name_entry entry; int complete; struct tree *tree; - tree = lookup_tree(sha1); + tree = lookup_tree(oid->hash); if (!tree) return 0; if (tree->object.flags & SEEN) @@ -73,7 +73,7 @@ static int tree_is_complete(const unsigned char *sha1) if (!tree->buffer) { enum object_type type; unsigned long size; - void *data = read_sha1_file(sha1, &type, &size); + void *data = read_sha1_file(oid->hash, &type, &size); if (!data) { tree->object.flags |= INCOMPLETE; return 0; @@ -85,7 +85,7 @@ static int tree_is_complete(const unsigned char *sha1) complete = 1; while (tree_entry(&desc, &entry)) { if (!has_sha1_file(entry.oid->hash) || - (S_ISDIR(entry.mode) && !tree_is_complete(entry.oid->hash))) { + (S_ISDIR(entry.mode) && !tree_is_complete(entry.oid))) { tree->object.flags |= INCOMPLETE; complete = 0; } @@ -152,7 +152,7 @@ static int commit_is_complete(struct commit *commit) for (i = 0; i < found.nr; i++) { struct commit *c = (struct commit *)found.objects[i].item; - if (!tree_is_complete(c->tree->object.oid.hash)) { + if (!tree_is_complete(&c->tree->object.oid)) { is_incomplete = 1; c->object.flags |= INCOMPLETE; }