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 B68421F829 for ; Mon, 1 May 2017 02:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2999593AbdEACbo (ORCPT ); Sun, 30 Apr 2017 22:31:44 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:36062 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S642388AbdEACay (ORCPT ); Sun, 30 Apr 2017 22:30:54 -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 197AE280CC; Mon, 1 May 2017 02:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1493605811; bh=NT1UQpbQkttVCT8qw5qwLDW12XNaybjk6AVQNEkk/JQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zSIsvhsNe1yyaeXkh+Vd9wqo53qSa8ejtw5DWCXtkU97wixyXLVafzI1n7ya/m9JM gf6KmDyMTeGjbCwXayo+s2GThXnCzy2Ns12FyzNtl180IQroPuLYnvisFQORbATLzS FzXk2RANDnpi+aZItSXRCOPDrJ/1QMegLWQIQM+eWMJaZmHJMIvF3Bp2kCOH8ZIlOW EAlggesnRhjI2RtwnkE1Xa+wclCx9xbBDGRruAEZLT8Dx7f8kwCb1LeyVxCm2MeF7O q+3qkUWKmvDA1wkZ5JJaO5SgO/djB1i+PWJyfANYpdzeTWCmbjkWEdAbQByZiCKqXM DF+DfeS2xX7z7bKcAjxOA+gDcVn+ZgTnhCaEbK01JH/Nf+zzEtIdQPTaoIPszvn224 hm3NqW2+2xay6C0vJsxcNCU/ePDEVlJDTxxX/lMtmcfOfZavmbeaigJtjSNGppdFW9 EqZMPFlQGV6EDE4E4p/WpO+3bpxTsh78LlwV1Btvu0N3oHyFwvw From: "brian m. carlson" To: git@vger.kernel.org Cc: Michael Haggerty , Stefan Beller , Jeff King , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 30/53] tree: convert read_tree_1 to use struct object_id internally Date: Mon, 1 May 2017 02:29:23 +0000 Message-Id: <20170501022946.258735-31-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.13.0.rc0.306.g87b477812d In-Reply-To: <20170501022946.258735-1-sandals@crustytoothpaste.net> References: <20170501022946.258735-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 --- tree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tree.c b/tree.c index 33fa7ee71..21fd80b80 100644 --- a/tree.c +++ b/tree.c @@ -58,7 +58,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, { struct tree_desc desc; struct name_entry entry; - unsigned char sha1[20]; + struct object_id oid; int len, oldlen = base->len; enum interesting retval = entry_not_interesting; @@ -87,7 +87,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, } if (S_ISDIR(entry.mode)) - hashcpy(sha1, entry.oid->hash); + oidcpy(&oid, entry.oid); else if (S_ISGITLINK(entry.mode)) { struct commit *commit; @@ -102,7 +102,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, oid_to_hex(entry.oid), base->buf, entry.path); - hashcpy(sha1, commit->tree->object.oid.hash); + oidcpy(&oid, &commit->tree->object.oid); } else continue; @@ -110,7 +110,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, len = tree_entry_len(&entry); strbuf_add(base, entry.path, len); strbuf_addch(base, '/'); - retval = read_tree_1(lookup_tree(sha1), + retval = read_tree_1(lookup_tree(oid.hash), base, stage, pathspec, fn, context); strbuf_setlen(base, oldlen);