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 7454C2027C for ; Thu, 13 Jul 2017 23:49:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753033AbdGMXto (ORCPT ); Thu, 13 Jul 2017 19:49:44 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:59712 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752776AbdGMXtg (ORCPT ); Thu, 13 Jul 2017 19:49:36 -0400 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:254c:7dd1:74c7:cde0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by castro.crustytoothpaste.net (Postfix) with ESMTPSA id B26B9280B4; Thu, 13 Jul 2017 23:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1499989775; bh=s2PwjGnPR23NU2ULhPvGtxM5gWtU9ZcLrJfXkaRZwPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f3uU++DQX+zqsSf9FqBwVylltEizKy8GAv6sD683bgyj/HSJxLTtdcs+DaRmDR5U5 YXiRcikUd1mlcdEAgZQHLHvJDKCIRomcS7NSUrIivfJs+gKmmDkj1bQzXHx6rXHUuS EI4UKG2hCKfO/4fnJpT3iu+CGivZXa/av4QQrIce2JMHmZgFfv/4VanCNUgxoM6bm8 j455xCq2UwroYyQbCcVHN8xqkUbK5SfDQaz7z9Lq/R1dLdJcwTiu3gaHHRcZIp143Y 2iyXkm7d8zcKhULwHbxOBIc4oeUdHTJHMboGKxZxCC+Rrsxr7hhRGexEfUBEe29xTf uMzVFRvnLOKAhrDfD1+bmKRccK9ynGO6IqOmlRF9utEmrYZTMnV8UPmqXW1Uso8K1D XI/36pi1cOt8oKefggweOu3jXmJ9mNsc9UTJOVRawNQpQCYgc1t4VGU5ixDgSBaFJs 7g5HocayEzl9co4lt/wH+JFl64wF227Fvp4bPYeilI8DESGRSNL From: "brian m. carlson" To: git@vger.kernel.org Cc: Brandon Williams , Stefan Beller , Jeff King Subject: [PATCH v2 07/13] bisect: convert bisect_checkout to struct object_id Date: Thu, 13 Jul 2017 23:49:24 +0000 Message-Id: <20170713234930.949612-8-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.13.2.932.g7449e964c In-Reply-To: <20170713234930.949612-1-sandals@crustytoothpaste.net> References: <20170713234930.949612-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 --- bisect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bisect.c b/bisect.c index a9fd9fbc61..2549eaf7b1 100644 --- a/bisect.c +++ b/bisect.c @@ -680,16 +680,16 @@ static int is_expected_rev(const struct object_id *oid) return res; } -static int bisect_checkout(const unsigned char *bisect_rev, int no_checkout) +static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout) { char bisect_rev_hex[GIT_MAX_HEXSZ + 1]; - memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1); - update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); + memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1); + update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev->hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR); argv_checkout[2] = bisect_rev_hex; if (no_checkout) { - update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); + update_ref(NULL, "BISECT_HEAD", bisect_rev->hash, NULL, 0, UPDATE_REFS_DIE_ON_ERR); } else { int res; res = run_command_v_opt(argv_checkout, RUN_GIT_CMD); @@ -796,7 +796,7 @@ static void check_merge_bases(int no_checkout) handle_skipped_merge_base(mb); } else { printf(_("Bisecting: a merge base must be tested\n")); - exit(bisect_checkout(mb->hash, no_checkout)); + exit(bisect_checkout(mb, no_checkout)); } } @@ -939,7 +939,7 @@ int bisect_next_all(const char *prefix, int no_checkout) struct rev_info revs; struct commit_list *tried; int reaches = 0, all = 0, nr, steps; - const unsigned char *bisect_rev; + struct object_id *bisect_rev; char *steps_msg; read_bisect_terms(&term_bad, &term_good); @@ -977,11 +977,11 @@ int bisect_next_all(const char *prefix, int no_checkout) exit(4); } - bisect_rev = revs.commits->item->object.oid.hash; + bisect_rev = &revs.commits->item->object.oid; - if (!hashcmp(bisect_rev, current_bad_oid->hash)) { + if (!oidcmp(bisect_rev, current_bad_oid)) { exit_if_skipped_commits(tried, current_bad_oid); - printf("%s is the first %s commit\n", sha1_to_hex(bisect_rev), + printf("%s is the first %s commit\n", oid_to_hex(bisect_rev), term_bad); show_diff_tree(prefix, revs.commits->item); /* This means the bisection process succeeded. */