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 3519F207F8 for ; Sat, 6 May 2017 22:13:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755134AbdEFWNP (ORCPT ); Sat, 6 May 2017 18:13:15 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:37944 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754211AbdEFWLx (ORCPT ); Sat, 6 May 2017 18:11:53 -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 50119280D9; Sat, 6 May 2017 22:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1494108678; bh=v47/5DpeWArSIuwy3i7qvugzLYHomigldtTkBBJFnl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q56l6GpZq8hCItGmV9USiwpaEF4PdwWOHn3lSIr7qHOK3UjTXeT+jk1qMhylJBpEN S56LoyXp5H26e7nSBpPbR8yWmzuQ+dL6epmcgR809LWrF9U30Zy1e6HC9sQkK5XI1A uDRBc2jwoO4cdDkbrsgHNHacqEoF4Ez9GyRQoHgR8SzLsW50Lsb4/cZvWd0aAyydib 3TCm3zRssNQEsV4UhxcZn9ZQw6tmCvECp7rmfUw9FvjCgzRIjLW1/dSzrY/4ORvc1W cnWgMhOjdQ8ufWQTbgTpVV/LcMHf+meSPN6KjSyGd07GIGTT7e502X5VKPee5RcP8F YAM/cOjl3m+Xh9bRXHT3l7UMRcqF36bmqM2BmZ77p1FW31cvcu4j3eqSFKs3n+4Pp6 UvUWRE137a2U2wsxkS9iPpbrniBwjMV+s/MtzkXufCixrZNm1POHWHxBzLbmojKEWz 5Tl1yM0z5KM8BCVmrnaoEE60CX0WsOInio+glGPAYMbItrj9jWZ 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 45/53] builtin/read-tree: convert to struct object_id Date: Sat, 6 May 2017 22:10:30 +0000 Message-Id: <20170506221038.296722-46-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 parse_tree_indirect, which must be converted in order to convert parse_object. Signed-off-by: brian m. carlson --- builtin/read-tree.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 23e212ee8..92eff23e4 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -23,13 +23,13 @@ static int read_empty; static struct tree *trees[MAX_UNPACK_TREES]; static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; -static int list_tree(unsigned char *sha1) +static int list_tree(struct object_id *oid) { struct tree *tree; if (nr_trees >= MAX_UNPACK_TREES) die("I cannot read more than %d trees", MAX_UNPACK_TREES); - tree = parse_tree_indirect(sha1); + tree = parse_tree_indirect(oid->hash); if (!tree) return -1; trees[nr_trees++] = tree; @@ -121,7 +121,7 @@ static struct lock_file lock_file; int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) { int i, stage = 0; - unsigned char sha1[20]; + struct object_id oid; struct tree_desc t[MAX_UNPACK_TREES]; struct unpack_trees_options opts; int prefix_set = 0; @@ -204,9 +204,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) for (i = 0; i < argc; i++) { const char *arg = argv[i]; - if (get_sha1(arg, sha1)) + if (get_oid(arg, &oid)) die("Not a valid object name %s", arg); - if (list_tree(sha1) < 0) + if (list_tree(&oid) < 0) die("failed to unpack tree object %s", arg); stage++; }