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, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, 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 1DA921FA21 for ; Mon, 9 Oct 2017 01:12:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753893AbdJIBMk (ORCPT ); Sun, 8 Oct 2017 21:12:40 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:54760 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753408AbdJIBMK (ORCPT ); Sun, 8 Oct 2017 21:12:10 -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 injection.crustytoothpaste.net (Postfix) with ESMTPSA id B456360D97; Mon, 9 Oct 2017 01:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1507511529; bh=RNaJqHWbzpKr5k6P7lrXBdUWy2Fvl7v7ETRmGqRDN9o=; 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=vuRWP24JVqYBavDBPp85iQMWU76Q+W7MtxxYPTIvDWnyECxoncKNVjeHAbRZAYk89 T7NZ07bLvr61mZsoCbDyHprMPekHrF37pKuuSrm/0Gi6neetjiMDP2VjtiH+FG1ojs uQiP8KqE9PRnTqq+AzZzaG6Or/gDbfK4FfFS6svdVwSxuU7P574ciAOpNn/+vVweNk hifGtF/Fy4eTV6ZacBiKJLt8V7Rud4+LnAjR+EDT7YpzZQQDtoBU96HaSD60Mp0PJl R+DW8asQWR/F+OIbXrTUUkJHHn+gemucGrYS3W8PF9m+hGkx8707f74a4i3m5xxpMt e/UkSZIuw8HiJzbzkeYTr8Q403JNbj1srBLupXGkXoDw0VPnCi+5dU4Z7qgMNHA/RF mn4TV3s2JNFX7X6HRozQAqppp2OVQi23c3BvrajvP4Be2V+fXQvvEVbE4XxJK0ssjO 20nQW3QNbDG1N/yZ/qFRifPHBNhR/AJr1eB4Vo7QL3DO49YRQ+m From: "brian m. carlson" To: git@vger.kernel.org Cc: Jeff King , Michael Haggerty , Brandon Williams , Stefan Beller Subject: [PATCH v2 20/24] worktree: convert struct worktree to object_id Date: Mon, 9 Oct 2017 01:11:28 +0000 Message-Id: <20171009011132.675341-21-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c In-Reply-To: <20171009011132.675341-1-sandals@crustytoothpaste.net> References: <20171009011132.675341-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 Convert the head_sha1 member to be head_oid instead. This is required to convert resolve_ref_unsafe. Signed-off-by: brian m. carlson --- builtin/worktree.c | 6 +++--- worktree.c | 2 +- worktree.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index de26849f55..d9fe6f694e 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -392,7 +392,7 @@ static void show_worktree_porcelain(struct worktree *wt) if (wt->is_bare) printf("bare\n"); else { - printf("HEAD %s\n", sha1_to_hex(wt->head_sha1)); + printf("HEAD %s\n", oid_to_hex(&wt->head_oid)); if (wt->is_detached) printf("detached\n"); else if (wt->head_ref) @@ -412,7 +412,7 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len) strbuf_addstr(&sb, "(bare)"); else { strbuf_addf(&sb, "%-*s ", abbrev_len, - find_unique_abbrev(wt->head_sha1, DEFAULT_ABBREV)); + find_unique_abbrev(wt->head_oid.hash, DEFAULT_ABBREV)); if (wt->is_detached) strbuf_addstr(&sb, "(detached HEAD)"); else if (wt->head_ref) { @@ -437,7 +437,7 @@ static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen) if (path_len > *maxlen) *maxlen = path_len; - sha1_len = strlen(find_unique_abbrev(wt[i]->head_sha1, *abbrev)); + sha1_len = strlen(find_unique_abbrev(wt[i]->head_oid.hash, *abbrev)); if (sha1_len > *abbrev) *abbrev = sha1_len; } diff --git a/worktree.c b/worktree.c index 70015629dc..cb35db03fa 100644 --- a/worktree.c +++ b/worktree.c @@ -31,7 +31,7 @@ static void add_head_info(struct worktree *wt) target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt), "HEAD", 0, - wt->head_sha1, &flags); + wt->head_oid.hash, &flags); if (!target) return; diff --git a/worktree.h b/worktree.h index 9276c81ae7..c28a880e18 100644 --- a/worktree.h +++ b/worktree.h @@ -8,7 +8,7 @@ struct worktree { char *id; char *head_ref; /* NULL if HEAD is broken or detached */ char *lock_reason; /* internal use */ - unsigned char head_sha1[20]; + struct object_id head_oid; int is_detached; int is_bare; int is_current; -- 2.14.2.920.gcf0c67979c