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.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD 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 03BA61FAE2 for ; Sun, 25 Feb 2018 21:12:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751893AbeBYVMb (ORCPT ); Sun, 25 Feb 2018 16:12:31 -0500 Received: from injection.crustytoothpaste.net ([192.241.140.119]:33840 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751874AbeBYVM2 (ORCPT ); Sun, 25 Feb 2018 16:12:28 -0500 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:e6b3:18ff:fe98:41a3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id DFF2B60E4D; Sun, 25 Feb 2018 21:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1519593146; bh=l/ZjgfmEdPH63a5+PxoJes0WtiPfGGj7/5IEnIzZS/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=VxsUn0+iL0UNIayv1NgPNQMPNVRGPB7ilfpJ4nPPHCQvSna12UaB3GR2TwwcZp/V+ VlRmnSxDId1HIjt29bO3bSVf1oXIVMTNAqJkml0fq9c/CKvw4s8gUgMzsrC9HOqTb+ 6eIXZ9cn16CeLfA6Yk1DWRCmU32tBTkMAxJhFXaptf9zhflOFoRNCw7ONCbfA7Pa7y qd03qxMfUhQCrgzG3X8S3hJDc0vjBAzvq+9JMM8gmlxuJpy7I+iu8NIcVIDp2iKwnB zwqBWU6LC3qgThNzrC1bpDUNCucf9PWay1DX5ZfGx1Rh+aU81CrACDNiom9AZ03Hkd hB1ntNPZ1YB3B8Ud2raJKojotg2Dzb4C3owtAldMiHRN1xXgf4ectJDLYpCxk3O7lw eRkEYvxdLBKMjKTifQKbaWaWqy0gnH9p+cUjtSdWPrcbDkKbVu3NirPUXkdykdfsdW Nf3pkP+RAQ47CleopED49FSDDImKUCeDACt61Y24bRy8CcNlPxr From: "brian m. carlson" To: git@vger.kernel.org Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Patryk Obara , Jeff King , Eric Sunshine Subject: [PATCH v2 02/36] builtin/write-tree: convert to struct object_id Date: Sun, 25 Feb 2018 21:11:38 +0000 Message-Id: <20180225211212.477570-3-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.16.2.395.g2e18187dfd In-Reply-To: <20180225211212.477570-1-sandals@crustytoothpaste.net> References: <20180225211212.477570-1-sandals@crustytoothpaste.net> X-Scanned-By: MIMEDefang 2.79 on 127.0.1.1 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is needed to convert parts of the cache-tree code. Signed-off-by: brian m. carlson --- builtin/write-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/write-tree.c b/builtin/write-tree.c index bd0a78aa3c..299a121531 100644 --- a/builtin/write-tree.c +++ b/builtin/write-tree.c @@ -19,7 +19,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) { int flags = 0, ret; const char *prefix = NULL; - unsigned char sha1[20]; + struct object_id oid; const char *me = "git-write-tree"; struct option write_tree_options[] = { OPT_BIT(0, "missing-ok", &flags, N_("allow missing objects"), @@ -38,10 +38,10 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) argc = parse_options(argc, argv, unused_prefix, write_tree_options, write_tree_usage, 0); - ret = write_cache_as_tree(sha1, flags, prefix); + ret = write_cache_as_tree(oid.hash, flags, prefix); switch (ret) { case 0: - printf("%s\n", sha1_to_hex(sha1)); + printf("%s\n", oid_to_hex(&oid)); break; case WRITE_TREE_UNREADABLE_INDEX: die("%s: error reading the index", me);