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.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 345761F51C for ; Sat, 19 May 2018 05:29:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750813AbeESF3C (ORCPT ); Sat, 19 May 2018 01:29:02 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:40179 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751117AbeESF2w (ORCPT ); Sat, 19 May 2018 01:28:52 -0400 Received: by mail-lf0-f68.google.com with SMTP id u140-v6so4593987lff.7 for ; Fri, 18 May 2018 22:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HrShMayrzF6V71gBRcFGEOerBB9LuN/F1LywT4HH2Zc=; b=KmZYTwOPvLRkmr0QUV3fA1XVonZol1qSf2TmnyQcgrWX1xUxjjSBsWUOgKH1ibwelR nnoTykgZ/HlhIPemwCKcyGgad4Nkam6+084/wR6wLHauOPhEBgdQjapGz78lnfWLod9V +3ocAmdeb1XN1lxsLXlJ7LBchG0iNipOWTp6eNhsEk0oq3V7tCxcGmJvS90rodIdKdB6 naMrx8IicoZlXDLd80vJtJHg6VjYr+ISWWnuguLPwtHFY/nVNBiOKdNMhM6mdUXxDkPn u4F0MUZ8DQkPVgd3Jf7i3YQC2XpDCGpcDqK2j8OUMQh32t57yEE6yxX2CKusihyN8ERn K7VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HrShMayrzF6V71gBRcFGEOerBB9LuN/F1LywT4HH2Zc=; b=T+X24JLnw9tRWK4CLIMN9SCYAgYVqfLpGdxtgqx1U/DAj2RnDaN3zHkBsrSWReva3o 2pjZ1n0e+/Z3GHAZrBwli00m7qE/sSNNpq0BiJaG0xR4naqooQdhwiABXfNEsQB8aNMO g0spgVm1I3HoHYfxWL6zTzY0KQMt0r+LFxuz7o6i6dMPfNQFEnUxN9ird2LiTsSLFXk5 eo74fjtgOkoiOgMyrb2f7+NuLtzfYZZDzBTiq9pSax5zgjyn+yMYpAhGeyYykuXVjT/Q hwHQGCrM8rdB6PebSVIuHd/iPMdpf35WWwEbV5Sitrb1WMWtyJ/MabeWRJWN3p62dl9A hXUQ== X-Gm-Message-State: ALKqPwdr6W7iZ3D2QgNCOEX9Qh9pFUBKpiVY8yotSVd8cnYgZVtNrQrR H+CQv+YCZc0OoB6pmVOY7nGO/g== X-Google-Smtp-Source: AB8JxZpsZzpvj53vBA6pNaVYa9QMmZZp/F0u4XwnDIfks1o36e2tfu59im9TZ2g5OSROum24Pbj0DA== X-Received: by 2002:a19:e910:: with SMTP id g16-v6mr22283180lfh.72.1526707730790; Fri, 18 May 2018 22:28:50 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id n5-v6sm1490874ljh.84.2018.05.18.22.28.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 22:28:50 -0700 (PDT) From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: pclouds@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, peff@peff.net Subject: [PATCH v3 14/15] merge: use commit-slab in merge remote desc instead of commit->util Date: Sat, 19 May 2018 07:28:30 +0200 Message-Id: <20180519052831.12603-15-pclouds@gmail.com> X-Mailer: git-send-email 2.17.0.705.g3525833791 In-Reply-To: <20180519052831.12603-1-pclouds@gmail.com> References: <20180513055208.17952-1-pclouds@gmail.com> <20180519052831.12603-1-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It's done so that commit->util can be removed. See more explanation in the commit that removes commit->util. --- builtin/merge.c | 25 +++++++++++++------------ commit.c | 12 ++++++++++-- commit.h | 2 +- merge-recursive.c | 8 +++++--- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 9db5a2cf16..fc55bc264b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -443,6 +443,7 @@ static void merge_name(const char *remote, struct strbuf *msg) struct object_id branch_head; struct strbuf buf = STRBUF_INIT; struct strbuf bname = STRBUF_INIT; + struct merge_remote_desc *desc; const char *ptr; char *found_ref; int len, early; @@ -515,16 +516,13 @@ static void merge_name(const char *remote, struct strbuf *msg) strbuf_release(&truname); } - if (remote_head->util) { - struct merge_remote_desc *desc; - desc = merge_remote_util(remote_head); - if (desc && desc->obj && desc->obj->type == OBJ_TAG) { - strbuf_addf(msg, "%s\t\t%s '%s'\n", - oid_to_hex(&desc->obj->oid), - type_name(desc->obj->type), - remote); - goto cleanup; - } + desc = merge_remote_util(remote_head); + if (desc && desc->obj && desc->obj->type == OBJ_TAG) { + strbuf_addf(msg, "%s\t\t%s '%s'\n", + oid_to_hex(&desc->obj->oid), + type_name(desc->obj->type), + remote); + goto cleanup; } strbuf_addf(msg, "%s\t\tcommit '%s'\n", @@ -932,8 +930,11 @@ static void write_merge_heads(struct commit_list *remoteheads) for (j = remoteheads; j; j = j->next) { struct object_id *oid; struct commit *c = j->item; - if (c->util && merge_remote_util(c)->obj) { - oid = &merge_remote_util(c)->obj->oid; + struct merge_remote_desc *desc; + + desc = merge_remote_util(c); + if (desc && desc->obj) { + oid = &desc->obj->oid; } else { oid = &c->object.oid; } diff --git a/commit.c b/commit.c index 57049118a5..e63a8dfeaa 100644 --- a/commit.c +++ b/commit.c @@ -1574,13 +1574,21 @@ int commit_tree_extended(const char *msg, size_t msg_len, return result; } +define_commit_slab(merge_desc_slab, struct merge_remote_desc *); +static struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab); + +struct merge_remote_desc *merge_remote_util(struct commit *commit) +{ + return *merge_desc_slab_at(&merge_desc_slab, commit); +} + void set_merge_remote_desc(struct commit *commit, const char *name, struct object *obj) { struct merge_remote_desc *desc; FLEX_ALLOC_STR(desc, name, name); desc->obj = obj; - commit->util = desc; + *merge_desc_slab_at(&merge_desc_slab, commit) = desc; } struct commit *get_merge_parent(const char *name) @@ -1592,7 +1600,7 @@ struct commit *get_merge_parent(const char *name) return NULL; obj = parse_object(&oid); commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT); - if (commit && !commit->util) + if (commit && !merge_remote_util(commit)) set_merge_remote_desc(commit, name, obj); return commit; } diff --git a/commit.h b/commit.h index e57ae4b583..838f6a6b26 100644 --- a/commit.h +++ b/commit.h @@ -303,7 +303,7 @@ struct merge_remote_desc { struct object *obj; /* the named object, could be a tag */ char name[FLEX_ARRAY]; }; -#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util)) +extern struct merge_remote_desc *merge_remote_util(struct commit *); extern void set_merge_remote_desc(struct commit *commit, const char *name, struct object *obj); diff --git a/merge-recursive.c b/merge-recursive.c index 0c0d48624d..5537f01f8e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -223,10 +223,12 @@ static void output(struct merge_options *o, int v, const char *fmt, ...) static void output_commit_title(struct merge_options *o, struct commit *commit) { + struct merge_remote_desc *desc; + strbuf_addchars(&o->obuf, ' ', o->call_depth * 2); - if (commit->util) - strbuf_addf(&o->obuf, "virtual %s\n", - merge_remote_util(commit)->name); + desc = merge_remote_util(commit); + if (desc) + strbuf_addf(&o->obuf, "virtual %s\n", desc->name); else { strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid, DEFAULT_ABBREV); -- 2.17.0.705.g3525833791