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=-4.5 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 47FC11F859 for ; Sun, 28 Aug 2016 23:28:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756230AbcH1X22 (ORCPT ); Sun, 28 Aug 2016 19:28:28 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:41102 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932448AbcH1X2J (ORCPT ); Sun, 28 Aug 2016 19:28:09 -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 1E56B280AA; Sun, 28 Aug 2016 23:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1472426887; bh=UHeZum9QKOMBcTRjICG2SnQ/csx+90xN8TtgPZXLTLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d2WKuQ/m3JP504hmANH6m3xEXPva1jWnRG5ciPiLRrmFB2aY9MeAdrp2E9ptTpYgS lgiXydNhUB+0wPf4Pb82nIYl8OfUr6lZ+b7xdb5/TYw0FGUsrVcES/QrPhGU+GWg/0 fBlyXAp6aigWFkP5nn3TWzbuUeibeyWNr5j03iZoDvWjYh9X+OLSM+3zjs8vnne+rz nX6+pkX3jCaPVUBA5tdJaw/GPzDfOduadRnhvbZyOGWs+hg9LQzo5oeSyXOx6Hj03O rN5nQw5cR7PYpdS/T5eesWqGcj1dqNzguMJMmtNe6pMxK67gHdg0mAvFYMNozQUBZ2 SRhopA0N4YNW9txY5EBtCl+rTsvb+5yDg2SKckYgfP6JiW4FTB8UOrPWOASGatsLBR IpJTq1+3EeTXY77D+hX8gA3QMNA8tVXuTNGlJG8k3kisGf9EZVg6FMlOhYmBdvss/i TZJPqVwPskPCaBU3Ndr7Q9CBKn0obkIXA0b6+Ox2kgXBWmNgtv/ From: "brian m. carlson" To: git@vger.kernel.org Cc: Paul Tan , Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Jeff King Subject: [PATCH 19/20] builtin/commit-tree: convert to struct object_id Date: Sun, 28 Aug 2016 23:27:56 +0000 Message-Id: <20160828232757.373278-20-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160828232757.373278-1-sandals@crustytoothpaste.net> References: <20160828232757.373278-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/commit-tree.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 8a674bc9..60501726 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -40,8 +40,8 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) { int i, got_tree = 0; struct commit_list *parents = NULL; - unsigned char tree_sha1[20]; - unsigned char commit_sha1[20]; + struct object_id tree_oid; + struct object_id commit_oid; struct strbuf buffer = STRBUF_INIT; git_config(commit_tree_config, NULL); @@ -52,13 +52,13 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (!strcmp(arg, "-p")) { - unsigned char sha1[20]; + struct object_id oid; if (argc <= ++i) usage(commit_tree_usage); - if (get_sha1_commit(argv[i], sha1)) + if (get_sha1_commit(argv[i], oid.hash)) die("Not a valid object name %s", argv[i]); - assert_sha1_type(sha1, OBJ_COMMIT); - new_parent(lookup_commit(sha1), &parents); + assert_sha1_type(oid.hash, OBJ_COMMIT); + new_parent(lookup_commit(oid.hash), &parents); continue; } @@ -105,7 +105,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) continue; } - if (get_sha1_tree(arg, tree_sha1)) + if (get_sha1_tree(arg, tree_oid.hash)) die("Not a valid object name %s", arg); if (got_tree) die("Cannot give more than one trees"); @@ -117,13 +117,13 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) die_errno("git commit-tree: failed to read"); } - if (commit_tree(buffer.buf, buffer.len, tree_sha1, parents, - commit_sha1, NULL, sign_commit)) { + if (commit_tree(buffer.buf, buffer.len, tree_oid.hash, parents, + commit_oid.hash, NULL, sign_commit)) { strbuf_release(&buffer); return 1; } - printf("%s\n", sha1_to_hex(commit_sha1)); + printf("%s\n", oid_to_hex(&commit_oid)); strbuf_release(&buffer); return 0; }