From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1837C63699 for ; Fri, 13 Nov 2020 12:11:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 75D9822240 for ; Fri, 13 Nov 2020 12:11:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YnvdTaMO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726610AbgKMMK7 (ORCPT ); Fri, 13 Nov 2020 07:10:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726558AbgKMMK5 (ORCPT ); Fri, 13 Nov 2020 07:10:57 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86541C0613D1 for ; Fri, 13 Nov 2020 04:10:57 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id a65so8263509wme.1 for ; Fri, 13 Nov 2020 04:10:57 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=erCmlE+BY3YMPeBRvPZQFAVR4wjD0xnNAA1juWeRcK8=; b=YnvdTaMOkmlN5A2K3UBMTbxthGY1qvNREgw+gediHUwoMalAi3XwBRg6LapDTbRz+5 oCPZsdRCwz8/7FymozPOroecQ04SS/AChhChkRO/xpULFZqXXY6MwJdHPi8EF3xZREr/ 20O7HAQiOB8NO7pfxpCP1EE2BVzTOp3tcPPaxg16kOlMs72JDk4gNwu9pUsBhP30llkc ZGfK6Yw1Kz8ASaYQkUPujVdDbHby4dKWwy7/zTPbRG/BWXxRsCrF438fzLVoGG4hoGXe kybQFU+WVCW8+fuHKiLgrG2p5enYyq64yft+ceJMFqdOXrU0esJ7O7y1KGsNaupg+PZp lCXw== 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:mime-version:content-transfer-encoding; bh=erCmlE+BY3YMPeBRvPZQFAVR4wjD0xnNAA1juWeRcK8=; b=eVqTmN1LVOkEl9WlubB3s+QEh03nRt+uoSn89QefyBaE/f1VTKq+oIQ5F5hQv3dmTG /eO6JeIYN19VXb6E7AZ8O39KevEJMI06W2ybVj1VMUYBKlfLsfPXKPbV261rs/7TtEW/ JTHPGaM2cwWcE4N9q7yBD7IyYQilZzlpXBHX9ep2TbfY91lBVBTHQCzhJwn1Ukq8JGOO 0xKBs8j4ZlisWt+8cxcmd+plENP19vQd+gkddIyvzX9VoKczAk1wReAWr+id7PlbGlQg ESHZW9pSuT9n88hAPeiw3r77mjVHfjOW59cazNwhocmiB2Crd14cyNcZDIetHqEuiIqe ZOQg== X-Gm-Message-State: AOAM532SsmVsr8naao0a/4V9zLoq+shILC74NhaYZD0qw675dpNECzqC WdneJ2QbngzebtarGQR1A2q7GyA+GAk= X-Google-Smtp-Source: ABdhPJyDZUs7AOKTef6WnaWY7MRcj3JqWD5zHOq+F56uo1XcwXDb1F7k298rlakwJTcxIve7IdBp7g== X-Received: by 2002:a1c:2bc3:: with SMTP id r186mr2112203wmr.163.1605269455995; Fri, 13 Nov 2020 04:10:55 -0800 (PST) Received: from ylate.lan (atoulouse-654-1-426-233.w2-6.abo.wanadoo.fr. [2.6.209.233]) by smtp.googlemail.com with ESMTPSA id g138sm10083697wme.39.2020.11.13.04.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 04:10:55 -0800 (PST) From: Alban Gruin To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Alban Gruin Subject: [PATCH v4 07/12] merge-recursive: move better_branch_name() to merge.c Date: Fri, 13 Nov 2020 12:04:23 +0100 Message-Id: <20201113110428.21265-8-alban.gruin@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201113110428.21265-1-alban.gruin@gmail.com> References: <20201005122646.27994-1-alban.gruin@gmail.com> <20201113110428.21265-1-alban.gruin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org better_branch_name() will be used by merge-octopus once it is rewritten in C, so instead of duplicating it, this moves this function preventively inside an appropriate file in libgit.a. This function is also renamed to reflect its usage by merge strategies. Signed-off-by: Alban Gruin --- builtin/merge-recursive.c | 16 ++-------------- cache.h | 2 +- merge.c | 12 ++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index a4bfd8fc51..972243b5e9 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -8,18 +8,6 @@ static const char builtin_merge_recursive_usage[] = "git %s ... -- ..."; -static char *better_branch_name(const char *branch) -{ - static char githead_env[8 + GIT_MAX_HEXSZ + 1]; - char *name; - - if (strlen(branch) != the_hash_algo->hexsz) - return xstrdup(branch); - xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch); - name = getenv(githead_env); - return xstrdup(name ? name : branch); -} - int cmd_merge_recursive(int argc, const char **argv, const char *prefix) { const struct object_id *bases[21]; @@ -75,8 +63,8 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) if (get_oid(o.branch2, &h2)) die(_("could not resolve ref '%s'"), o.branch2); - o.branch1 = better1 = better_branch_name(o.branch1); - o.branch2 = better2 = better_branch_name(o.branch2); + o.branch1 = better1 = merge_get_better_branch_name(o.branch1); + o.branch2 = better2 = merge_get_better_branch_name(o.branch2); if (o.verbosity >= 3) printf(_("Merging %s with %s\n"), o.branch1, o.branch2); diff --git a/cache.h b/cache.h index be16ab3215..2d844576ea 100644 --- a/cache.h +++ b/cache.h @@ -1933,7 +1933,7 @@ int checkout_fast_forward(struct repository *r, const struct object_id *from, const struct object_id *to, int overwrite_ignore); - +char *merge_get_better_branch_name(const char *branch); int sane_execvp(const char *file, char *const argv[]); diff --git a/merge.c b/merge.c index 5fb88af102..801d673c5f 100644 --- a/merge.c +++ b/merge.c @@ -109,3 +109,15 @@ int checkout_fast_forward(struct repository *r, return error(_("unable to write new index file")); return 0; } + +char *merge_get_better_branch_name(const char *branch) +{ + static char githead_env[8 + GIT_MAX_HEXSZ + 1]; + char *name; + + if (strlen(branch) != the_hash_algo->hexsz) + return xstrdup(branch); + xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch); + name = getenv(githead_env); + return xstrdup(name ? name : branch); +} -- 2.20.1