From patchwork Wed Apr 7 22:56:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189519 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 CC642C433B4 for ; Wed, 7 Apr 2021 22:56:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A30661245 for ; Wed, 7 Apr 2021 22:56:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229638AbhDGW4e (ORCPT ); Wed, 7 Apr 2021 18:56:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbhDGW4d (ORCPT ); Wed, 7 Apr 2021 18:56:33 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95CFDC061760 for ; Wed, 7 Apr 2021 15:56:23 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id j18so725037lfg.5 for ; Wed, 07 Apr 2021 15:56:23 -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 :mime-version:content-transfer-encoding; bh=AZY0pt9PS7URoeVZBoFthunzKB4BCSEyxxW9IeM9jkI=; b=KD21byo3aZyA3E79E/L9yuVgQdetKjyN2r+KunbuWHerU+V5vhf5ADlcUIAvIKxuwH Q6CgZm/DBu8I0LrFfESWZUm71TNhHfrvfiHuMfqtHIGFFK4aeQ1G4DkO0Lo8pd3Enh2I 4kkorxjLVzrRXV7buqLWf/Rl9Khxu6biFblnwtlkGn02pwlZF8cBXIuVn2DYXHZ23ltf wu9I8xlRWcHLXSUWzBtzbyAQ8y/p3QLQaVMg6fOZN/+Y5YwBoA4n2IYNJCQN0kD+ZTsB dl/PqzPS0mIRnM4XJADJRmjuv7+JFJhZ9dMlkPaitcLn3ko4fp2oVKSxr9lOMsX7pbVD OgPg== 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=AZY0pt9PS7URoeVZBoFthunzKB4BCSEyxxW9IeM9jkI=; b=mV1OR3nivKdspxwea07bFN3Of2xRfPLc37bwYEx9sA0uiW2DeS7UtPcFG5zbXMO39z CKksz4y0zx0y9vpURJW2LGstT4MmS1DWQMU069df8x4KTAQj/9pUhTmkckC8qJ7MxrVQ 1hRvU3CajWhAuQT1yJjSjRngHPb4nF+J+LzV/KlWNa4QjFV8B5XsALxMGLRMHBEHDe0r P8a+dNVzs6z8c+cF6m1hR3hJjjpx4wHuFJMlB7RbfyrNLtMA72yfogmxQIlX4JE+/u2M k5A2aGV+jeH4NR5Lex6CjwpOVDmyM7VRH+zMfgni2tbG/ptARpwrLS7jADwRjC94zB52 NW2g== X-Gm-Message-State: AOAM5302Q3x2HUc3dpA0kqcxaZwexob+KBv7IqvdJeCmvjMTOAQ7aZxR Zr12fzW/GyqfUPZQG1FG5s4= X-Google-Smtp-Source: ABdhPJxWmciMeB1tCVsE6OseXW39e1Av+Tkv9tTzd3OXmnOk+JH+Th7pyghFYP3yxCTC/SFcmHkTmg== X-Received: by 2002:ac2:43d0:: with SMTP id u16mr3913211lfl.263.1617836182136; Wed, 07 Apr 2021 15:56:22 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:21 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 1/9] diff-merges: introduce --diff-merges=def Date: Thu, 8 Apr 2021 01:56:00 +0300 Message-Id: <20210407225608.14611-2-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Introduce the notion of default diff format for merges, and the option "def" to select it. The default is "separate" and can't yet be changed, so effectively "dev" is just a synonym for "separate" for now. This is in preparation for introducing log.diffMerges configuration option that will let --diff-merges=def to be configured to any supported format. Signed-off-by: Sergey Organov --- diff-merges.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/diff-merges.c b/diff-merges.c index 146bb50316a6..0887a07cfc67 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -2,6 +2,8 @@ #include "revision.h" +typedef void (*diff_merges_setup_func_t)(struct rev_info *); + static void suppress(struct rev_info *revs) { revs->separate_merges = 0; @@ -19,6 +21,8 @@ static void set_separate(struct rev_info *revs) revs->separate_merges = 1; } +static diff_merges_setup_func_t set_to_default = set_separate; + static void set_first_parent(struct rev_info *revs) { set_separate(revs); @@ -66,6 +70,8 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg) set_combined(revs); else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined")) set_dense_combined(revs); + else if (!strcmp(optarg, "def")) + set_to_default(revs); else die(_("unknown value for --diff-merges: %s"), optarg); From patchwork Wed Apr 7 22:56:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189521 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.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, 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 5C7FAC43460 for ; Wed, 7 Apr 2021 22:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2238961184 for ; Wed, 7 Apr 2021 22:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229681AbhDGW4g (ORCPT ); Wed, 7 Apr 2021 18:56:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229652AbhDGW4e (ORCPT ); Wed, 7 Apr 2021 18:56:34 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77389C061760 for ; Wed, 7 Apr 2021 15:56:24 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id n138so744669lfa.3 for ; Wed, 07 Apr 2021 15:56:24 -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 :mime-version:content-transfer-encoding; bh=6y4PDA5OU6djTBMJ9vfefYoDq8e35okklITaBUhn6Yg=; b=cMHH2yabN7zqbsTc8RKCQMcuQgb7YASq4T3Fn5EklIiFZtJBYJ4qWfk0WHoKesGTio bk0rKVG0AngDtbiMTqxmshAajy4UcUNMHd6qgDR4nulk4QDySk3UzHnPQ3UMQh9g1oxk Ogz4nl33ZoTa8SCcRyCzjax1X+Px/oEB99CqTc8scpbEs/+HAdCspCoVpWmLL88vAEUj WRqNX4KYcVbiX/l/7/p6JwmWmHYtgkTGZwah2Ab7iUrhdUwNYDEJYUNVPSwxZlzwdZAh L+yk+uNkuXUog7+9IWCcq3yysE4MJ4GnsXKbtG4OQH8ohBD1dnr9ZsKX7mmySK0U3Yhu k3ng== 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=6y4PDA5OU6djTBMJ9vfefYoDq8e35okklITaBUhn6Yg=; b=BbyQe7bq6bY2E9GiiN08YPxczFuTxiDmgqv8kyXEMpCNCDj/yxBqIE53uaGxmcUZyJ mdao6e3ykCH8yZ+jNVxhrzdomMjDoM9uvpOK8nEm5HBjqFN8i03NlU5kkXh47m8h1ouU OqV30M4RMnX7ru0dFyHibwyKWr1wZ9lUl3CycbPwaT1qE7mqdP/bZG7M+CdBPgK0vroG jJT3XVyGVSsMJ9Xqnj8uCFa1Z44KFrl6EZJuBx+q4N/Cn3QLtnjbUq/CrC0zud6OwDc5 B1VnxUNDygkparjsvRde7ut+BWT83XEvVDtejxcBTqOI7w3KGnadN9S4k6btMVlmhdZm nZFA== X-Gm-Message-State: AOAM533f5RX7leLeEo47v7hpSia07GUPzZP9g9K5xaeugWM2NFFrY3or S8QuFgLO3HujAF5Q+hLPjkdkew5ysfE= X-Google-Smtp-Source: ABdhPJzIQsGnp6MB69UEmZEJkuQX6DTlfJfKWQRt2Bv3ZMQurBzjmobhIOkSj1NvqRhlC4J23i9Eiw== X-Received: by 2002:a05:6512:3692:: with SMTP id d18mr4086392lfs.128.1617836183034; Wed, 07 Apr 2021 15:56:23 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:22 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 2/9] diff-merges: refactor set_diff_merges() Date: Thu, 8 Apr 2021 01:56:01 +0300 Message-Id: <20210407225608.14611-3-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Split set_diff_merges() into separate parsing and execution functions, the former to be reused later in the series for parsing of configuration values. Signed-off-by: Sergey Organov --- diff-merges.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/diff-merges.c b/diff-merges.c index 0887a07cfc67..93ede09fb36f 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -3,6 +3,9 @@ #include "revision.h" typedef void (*diff_merges_setup_func_t)(struct rev_info *); +static void set_separate(struct rev_info *revs); + +static diff_merges_setup_func_t set_to_default = set_separate; static void suppress(struct rev_info *revs) { @@ -21,8 +24,6 @@ static void set_separate(struct rev_info *revs) revs->separate_merges = 1; } -static diff_merges_setup_func_t set_to_default = set_separate; - static void set_first_parent(struct rev_info *revs) { set_separate(revs); @@ -54,29 +55,35 @@ static void set_dense_combined(struct rev_info *revs) revs->dense_combined_merges = 1; } -static void set_diff_merges(struct rev_info *revs, const char *optarg) +static diff_merges_setup_func_t func_by_opt(const char *optarg) { - if (!strcmp(optarg, "off") || !strcmp(optarg, "none")) { - suppress(revs); - /* Return early to leave revs->merges_need_diff unset */ - return; - } - + if (!strcmp(optarg, "off") || !strcmp(optarg, "none")) + return suppress; if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent")) - set_first_parent(revs); + return set_first_parent; else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate")) - set_separate(revs); + return set_separate; else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined")) - set_combined(revs); + return set_combined; else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined")) - set_dense_combined(revs); + return set_dense_combined; else if (!strcmp(optarg, "def")) - set_to_default(revs); - else + return set_to_default; + return NULL; +} + +static void set_diff_merges(struct rev_info *revs, const char *optarg) +{ + diff_merges_setup_func_t func = func_by_opt(optarg); + + if (!func) die(_("unknown value for --diff-merges: %s"), optarg); - /* The flag is cleared by set_xxx() functions, so don't move this up */ - revs->merges_need_diff = 1; + func(revs); + + /* NOTE: the merges_need_diff flag is cleared by func() call */ + if (func != suppress) + revs->merges_need_diff = 1; } /* From patchwork Wed Apr 7 22:56:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189523 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 381C1C433B4 for ; Wed, 7 Apr 2021 22:56:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15AF36121E for ; Wed, 7 Apr 2021 22:56:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229691AbhDGW4i (ORCPT ); Wed, 7 Apr 2021 18:56:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbhDGW4f (ORCPT ); Wed, 7 Apr 2021 18:56:35 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E311C061761 for ; Wed, 7 Apr 2021 15:56:25 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id n8so756610lfh.1 for ; Wed, 07 Apr 2021 15:56:25 -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 :mime-version:content-transfer-encoding; bh=Yeb4z2Gh+0XMtgEW0OXcqKq8tQUnuhNarRigoMl7YzA=; b=Jb336jeNUzkbiHdSYFrEzDUXSs/TYn+7hB3CyGqgyL6O+eZ5jx9UeOSkBGD7uem/lQ 7mMHXTZd9aBMpxq0nFF9LFoyFU9p3Wb2r7oZ9m2d3FEYY6yUQeA2qgA5ItPY/cKljvaj vMiNgEAGpaK59+RA58ISj/O74N5NxTvl56SYx6syu4l8v9V1N6kYV+2U0DfWwJUoGofN 0wrWpbsh344vDM9Ym0icCSM1CkZt4irGPUPNBAzxVCzPjkhKP/cxqpShAPAdnW4dijKS 2E0U8AhqC4BWbfkFLZEn7TIQqvIPimp82NucF7+DmQWKN1+ZbgiFWm10RvErhikeQhYj 8Fug== 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=Yeb4z2Gh+0XMtgEW0OXcqKq8tQUnuhNarRigoMl7YzA=; b=T5MZvWi3k34BMMWHuGA9CajMP1ogAzcN7mKuRlm1xugxd8eoSxLFUjvctkAkAtKMBW ACq1527XPveLt3GDK9nVy22VtkqkCajeHfZjbi4UyOTXNhLhZTd//b4uzlv7mvdxCYez 2HVd7pYzzW3tHF3O20Fca0zA86ftSYkDqPBBtQBT6ClA8oz/p2XgokjWVbaQ0DlOqyp7 yWl0knRNLTInf6wz3fBDiMepq/EZrMtXbAxjS/5LrlBMXq2thsdNSzUYqA7huxzhK2+f 0RTPw/XrRzm/PxycLRnNU9Cc2EDBd4Wg5gtvtS6YwO9nd7vNji/EGA/FW1+IjhoG+qGI UMnQ== X-Gm-Message-State: AOAM532Tonfp2zDXNWdEce0LTDAuTjaotChqVR25KdOJrVYpQCWH+CID pDHyo/KpAY0bY0DdGfPIrEM/6qfHBAo= X-Google-Smtp-Source: ABdhPJyE26AjdPGY9UxjjurlR9WXk93Sm+sRWO7RfOCSqXqHBLTdbGX/jWjb84pSUson2rbVfUZ+qw== X-Received: by 2002:ac2:46d5:: with SMTP id p21mr4276007lfo.295.1617836183877; Wed, 07 Apr 2021 15:56:23 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:23 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 3/9] diff-merges: introduce log.diffMerges config variable Date: Thu, 8 Apr 2021 01:56:02 +0300 Message-Id: <20210407225608.14611-4-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org New log.diffMerges configuration variable sets the format that --diff-merges=def will be using. The default is "separate". Signed-off-by: Sergey Organov --- builtin/log.c | 2 ++ diff-merges.c | 11 +++++++++++ diff-merges.h | 2 ++ 3 files changed, 15 insertions(+) diff --git a/builtin/log.c b/builtin/log.c index 8acd285dafd8..6102893fccb9 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -481,6 +481,8 @@ static int git_log_config(const char *var, const char *value, void *cb) decoration_style = 0; /* maybe warn? */ return 0; } + if (!strcmp(var, "log.diffmerges")) + return diff_merges_config(value); if (!strcmp(var, "log.showroot")) { default_show_root = git_config_bool(var, value); return 0; diff --git a/diff-merges.c b/diff-merges.c index 93ede09fb36f..ca4d94a9039d 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -90,6 +90,17 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg) * Public functions. They are in the order they are called. */ +int diff_merges_config(const char *value) +{ + diff_merges_setup_func_t func = func_by_opt(value); + + if (!func) + return -1; + + set_to_default = func; + return 0; +} + int diff_merges_parse_opts(struct rev_info *revs, const char **argv) { int argcount = 1; diff --git a/diff-merges.h b/diff-merges.h index 659467c99a4f..09d9a6c9a4fb 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -9,6 +9,8 @@ struct rev_info; +int diff_merges_config(const char *value); + int diff_merges_parse_opts(struct rev_info *revs, const char **argv); void diff_merges_suppress(struct rev_info *revs); From patchwork Wed Apr 7 22:56:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189525 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 F17FCC43460 for ; Wed, 7 Apr 2021 22:56:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C62226121E for ; Wed, 7 Apr 2021 22:56:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229702AbhDGW4j (ORCPT ); Wed, 7 Apr 2021 18:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229686AbhDGW4g (ORCPT ); Wed, 7 Apr 2021 18:56:36 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D447C061760 for ; Wed, 7 Apr 2021 15:56:26 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id b4so716613lfi.6 for ; Wed, 07 Apr 2021 15:56:26 -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 :mime-version:content-transfer-encoding; bh=mSugcimYS1yM0nhmdIY7KmBpLpqgyja/1sAs1db3Q5s=; b=cB13QoxQfRxPWYy/n8Woz/Lf91ulZgg7ggZGPkOjVlXFQOGTPsxZ9PKnQpYhL1W65f bqDm6pbb0bcoT+oNacXsGmvo3v75LOl2Sr6/UhzQaMDHCT4lMVNtg5q6pN75g478hO/Y TIvu/6AlXdkM0qpxEaAgDLcieUaraWGf18jj8tjI07PkyGZl6Iw0uOxpGCwuufZAemWR U28IPzAVmNLCb68FbagJzi/g9df6T1AXZZVjdDfpJTcTSoXQouCIJXSPxvPFMCx7++OD 0FUA5BQqPoFFYqnIrFKRHwDvYAGzQdD3pVGV/JcdTxdsH6CSLxe5nMpyqz/TIs9i3O3u lnzw== 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=mSugcimYS1yM0nhmdIY7KmBpLpqgyja/1sAs1db3Q5s=; b=ApfhX0TPhWrQH+cu0g2C3JrVb/uyEe6rRWZZ2SnjUA7iegpr9MzKq5nsItv5fqdP9G X9W7jkAtUPdy/LaytUWnrw9NoHNSulbVmO9YtgStnHduQbnIBEi4FQvpUGbChRDhzC1n Vp34V0bPX58BPWcY54njvE+lxoU1Nr7tnN8/Qv8pfRt4FEKhvgU/wO9Y25GuLIpi4W9p hpQUdGQ/9Xt3AX+UN/Tw6kFZ+28a6Ul7Uh0XiR4TI3bxVVXCHsBLHJUn09FNNmu4MFvh 9gADNBorwAwPwirylzQ2yaIZZeekTFhIEekg21h5WdpyhZZkUfG9btcnytrzvQgjEGPT SZsg== X-Gm-Message-State: AOAM531sGTLSypeh0hla1gUaPbFzCPw5wfzyo3Yof7jwwFIWda201rQd ePCnSp75zIadmhRCy9HjVbE= X-Google-Smtp-Source: ABdhPJzTEtcJK34mWHHThhUvb9+H1EVtL/NmYaeo+KZbt8Ds7JQfp9FUGtsDMZwfboci0r5ZH3pdnw== X-Received: by 2002:a05:6512:c04:: with SMTP id z4mr3980844lfu.299.1617836184746; Wed, 07 Apr 2021 15:56:24 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:24 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 4/9] diff-merges: adapt -m to enable default diff format Date: Thu, 8 Apr 2021 01:56:03 +0300 Message-Id: <20210407225608.14611-5-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Let -m option (and --diff-merges=m) enable the default format instead of "separate", to be able to tune it with log.diffMerges option. Signed-off-by: Sergey Organov --- diff-merges.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/diff-merges.c b/diff-merges.c index ca4d94a9039d..f68e4376fd63 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -34,10 +34,10 @@ static void set_m(struct rev_info *revs) { /* * To "diff-index", "-m" means "match missing", and to the "log" - * family of commands, it means "show full diff for merges". Set + * family of commands, it means "show default diff for merges". Set * both fields appropriately. */ - set_separate(revs); + set_to_default(revs); revs->match_missing = 1; } @@ -61,13 +61,13 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg) return suppress; if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent")) return set_first_parent; - else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate")) + else if (!strcmp(optarg, "separate")) return set_separate; else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined")) return set_combined; else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined")) return set_dense_combined; - else if (!strcmp(optarg, "def")) + else if (!strcmp(optarg, "m") || !strcmp(optarg, "def")) return set_to_default; return NULL; } From patchwork Wed Apr 7 22:56:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189527 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 08B5AC433ED for ; Wed, 7 Apr 2021 22:56:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1C986124C for ; Wed, 7 Apr 2021 22:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229712AbhDGW4j (ORCPT ); Wed, 7 Apr 2021 18:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229652AbhDGW4h (ORCPT ); Wed, 7 Apr 2021 18:56:37 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 026E1C061762 for ; Wed, 7 Apr 2021 15:56:27 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id r8so685374lfp.10 for ; Wed, 07 Apr 2021 15:56:26 -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 :mime-version:content-transfer-encoding; bh=ilQ/QpCgaV0kdQYtTqfM5166jU7yNx17Nae+WbsPqDE=; b=VnE04BgDUoQxAUGSaAARrMVJZUc2YCa07xw7t/jpWTQpbeNo5NQgEL0tTVyV3l+SZD 84NzoRp1WhTVIcy5V0rA/f4/0i6r9r+TBWkjtadtzEgNnXD2ffELyiiMqj4qUvfvWT5Q oPSWwNayhgUSyDFAZXPTKEptMuopR4Bra6gLG8OF/GR7RgkA4kxXtUjY8olgNeBS4gR1 GmY8ozkjgkSYZMSxqYUIhp7OwCMSHbVxypBC0MS4SgPLOHOQ/8yoETfI88VyTVf6w6b0 XBtZOaqDcG/qvrxm9xjB5oJO0+P93G1F19sKZUBo+MyPMWXK+quFmF9ndleQDqaEf8SA zyBQ== 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=ilQ/QpCgaV0kdQYtTqfM5166jU7yNx17Nae+WbsPqDE=; b=SiUfR6JqnZlwuesnJU6wjflfNEjLv9dXrpUqbB8UPUg32543ZGctETAC8ZZ2G7OAL4 lz32GzG4b7gqIYO1+SBtgUqTFCERpxNPHYVtMhxCdpYEd/MucHujM6BG/1NmRcMr/h5v Z1bo9XdFIj8aGlBl+ju8RAFGqTWXLiIpNUzSDBvDW2VFwu+epmoKLpUKzljmhPRtux9m pISX6AqSYra5nK2LMl8HM9wohJfQdJlMo4kqAY0Z9I9mD7QZEFzQzNVKmSxaWDJKYMe+ PzploSlorRofUmxqzKh7cd8R8S3CqboicbHyEv8tffXdLL6ssLzFgPrN6yMamXZRMBz0 UulQ== X-Gm-Message-State: AOAM5326t8cjRfvvLqftWYkNEVbaWp9ASKm6LfIYf+4+3hU5DcP/al1d dQqIZo/MCcYScnlQf2T8XnuEVinXY10= X-Google-Smtp-Source: ABdhPJwJEvhpRliEQRNETUxXevzKh4RXTHEQlmfKpNRkvAq8qeeNep4LzLEpRy9v86pxP1N83f/N8Q== X-Received: by 2002:a05:6512:3aa:: with SMTP id v10mr4077714lfp.308.1617836185597; Wed, 07 Apr 2021 15:56:25 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:25 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 5/9] t4013: add test for --diff-merges=def Date: Thu, 8 Apr 2021 01:56:04 +0300 Message-Id: <20210407225608.14611-6-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This new option by default should match --diff-merges=separate, so test this. Signed-off-by: Sergey Organov --- t/t4013-diff-various.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 6cca8b84a6bf..275a6790896d 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -452,6 +452,14 @@ diff-tree --stat --compact-summary initial mode diff-tree -R --stat --compact-summary initial mode EOF +test_expect_success 'log --diff-merges=def matches --diff-merges=separate' ' + git log -p --diff-merges=separate master >result && + process_diffs result >expected && + git log -p --diff-merges=def master >result && + process_diffs result >actual && + test_cmp expected actual +' + test_expect_success 'log -S requires an argument' ' test_must_fail git log -S ' From patchwork Wed Apr 7 22:56:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189529 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 E7442C433B4 for ; Wed, 7 Apr 2021 22:56:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8A0D6121E for ; Wed, 7 Apr 2021 22:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229723AbhDGW4k (ORCPT ); Wed, 7 Apr 2021 18:56:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbhDGW4i (ORCPT ); Wed, 7 Apr 2021 18:56:38 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAB8BC061763 for ; Wed, 7 Apr 2021 15:56:27 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id g8so671099lfv.12 for ; Wed, 07 Apr 2021 15:56:27 -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 :mime-version:content-transfer-encoding; bh=AUsIQRj1onwryjyYAz0ft9PONSwV/jVQ/QRT5WoYNcQ=; b=duxW4xp3uhgzJRDB1P7aqAvnf7d4DDJXjvQzWKQ68ps8W4cLoKWYyw2nL+f3+XdOAJ 6PfyxPhdiVb9ChvFPq4U1EPUAwmOyneZ0/WX/i2kFvGX7W7/e6Nr6jU5VQrBHjJLpO/2 cLJ41TkquMDsVOq9Tqe3L+aH0wyg1wMeLjXOnvSsArLHQ72zKO0qLWEZiXSWPbs/bZw6 Moa1ezVBBa/flpkaVmq2uObnWld4luOK0F/a29UVM5aVOvCPPRn4COrDKwghlinuyOV6 9s/kGhxDJs0/WGq8O7F8uTWwngxuXfGaMZofKy70HWmwc58zv56h1HRPqHb5wyAwmnY1 LNJA== 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=AUsIQRj1onwryjyYAz0ft9PONSwV/jVQ/QRT5WoYNcQ=; b=Tm/LDcu5Q1LyfaMTrRPW1EnrvcgmmOTdG9n/hVGUQo79ehQQ0bOsu6ooOEbQb/6/NH H8Dw15UJHRi3AFwNQ2WsERRUYw/FDhiw2/alt5ixUlCxGBwkhKYF5Nn7BvmnSjJt8o8t WFgpNmAbHkr9AozTRw2vDQiJMGz4MIb86Ztbrq9b1cRbqhcUTKczy5AcLdidIl1iFqjd F9ad3dbG5zkphk0NBAKfA1mm04MZg5CXmP6ZMli6uNV+DUyq4Uh80oNe6rEREop7MBuY kXlLW+1/KwEui3MdwLbI+72zzfys2seYgn46Da5OPPOTdhOSjFPwgvyQlc4FKQHr/HxV OtKQ== X-Gm-Message-State: AOAM530+tF69oDHGdpsgUWgbA0GMfWBX5QEO48malMZvrLwz7ZTOY7b5 kJ+PoQy2JKHOf90ggjSfw8A= X-Google-Smtp-Source: ABdhPJxCFTE4TgVB3qMx6dSJXseCCY+0Sd9JqvTlAeq933yVC5j7dTLmsEqUsOV4C/r1+0leoyTB7A== X-Received: by 2002:ac2:548a:: with SMTP id t10mr3838699lfk.309.1617836186411; Wed, 07 Apr 2021 15:56:26 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:26 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 6/9] t4013: add tests for log.diffMerges config Date: Thu, 8 Apr 2021 01:56:05 +0300 Message-Id: <20210407225608.14611-7-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Test that wrong values are denied. Test that the value of log.diffMerges properly affects both --diff-merges=def and -m. Signed-off-by: Sergey Organov --- t/t4013-diff-various.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 275a6790896d..ee4afca06ced 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -460,6 +460,32 @@ test_expect_success 'log --diff-merges=def matches --diff-merges=separate' ' test_cmp expected actual ' +test_expect_success 'deny wrong log.diffMerges config' ' + git config log.diffMerges wrong-value && + test_expect_code 128 git log && + git config --unset log.diffMerges +' + +test_expect_success 'git config log.diffMerges first-parent' ' + git log -p --diff-merges=first-parent master >result && + process_diffs result >expected && + git config log.diffMerges first-parent && + git log -p --diff-merges=def master >result && + process_diffs result >actual && + git config --unset log.diffMerges && + test_cmp expected actual +' + +test_expect_success 'git config log.diffMerges first-parent vs -m' ' + git log -p --diff-merges=first-parent master >result && + process_diffs result >expected && + git config log.diffMerges first-parent && + git log -p -m master >result && + process_diffs result >actual && + git config --unset log.diffMerges && + test_cmp expected actual +' + test_expect_success 'log -S requires an argument' ' test_must_fail git log -S ' From patchwork Wed Apr 7 22:56:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189531 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 B3119C433ED for ; Wed, 7 Apr 2021 22:56:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90D1D61242 for ; Wed, 7 Apr 2021 22:56:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229736AbhDGW4l (ORCPT ); Wed, 7 Apr 2021 18:56:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbhDGW4j (ORCPT ); Wed, 7 Apr 2021 18:56:39 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A461AC061760 for ; Wed, 7 Apr 2021 15:56:28 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 184so22654798ljf.9 for ; Wed, 07 Apr 2021 15:56:28 -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 :mime-version:content-transfer-encoding; bh=odf0LAlm/YjRtd0usOxwF92IYjGT9xm5nXDOql5Y01Q=; b=FZoS3AY6YmgEwWbl84zJDgrs0cfHr4uZbBIJISYJSkNDtesh6WotHtMiCMQR+/vB+5 c2PzIWWV5bHWHfmb+vBXBLCI/5GLtmyxjkgEDWu3HNsg5QDErQ2C6koZeeEox6xDpEwp SeBwRTDLlcjohfqUHKbhi3wAnRvP7TBalo3vdrkvpf57NAofKfRbdnULbWaYnHO7TwWz tbzxvMIbGDtT7fBVM505I0TesRK4yA+gvJDZ5BJkH9AxxHsnggxcLtDExPDf71+IIjrA h5XTFYQTP6rBbwQtOj6IwIV09C6CgXjI1p/DivtgIo1uiSK4JuQJiBjJEBpKjChZnYuk x9Nw== 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=odf0LAlm/YjRtd0usOxwF92IYjGT9xm5nXDOql5Y01Q=; b=hESANc5BCIJgCBYanrxzmbl25vfezD7UacrjD/S+N3iQcv8gI0LFfKtdZK5G7p8Cou Hpsv0EwrGA8YSy+Ztn+BLa91zql3sF2FN1WRmE8RfCQa6PkuM4XnGwtzmtwuuJwsWX+P LXjJ7KARMEg+MLFMv941khm8uRQsRLUtLV08f2iEFzTbT+IqPvRnCMJGan2e+wwWk6Dk h+rFkt7KYnidcOPs0pM8iaqz7MQmQOzxcU7UKn6wGFw2GM6YSejGFkbUNTiNYMm1+mCM iJE25uveTNcQeZE094xTzJXgJuIBraXB0TD+7ZPQKoF4V5miFkiwy+HCYiu13Ar5+kLN hFvQ== X-Gm-Message-State: AOAM530xgPylgWJUE4OC94ksvNeAZt50Y5ygw7M4PLOQypSih7V9Kgl3 jaRFjlp8/Qf0iJ3DUig9PaU= X-Google-Smtp-Source: ABdhPJzJATU56ED5lWcpJgoSDkmYgcnhEkSXD56xcN58Wokn1wwF5L7276hQcM2lAlKSbOcbiSVPYQ== X-Received: by 2002:a05:651c:282:: with SMTP id b2mr3491034ljo.176.1617836187205; Wed, 07 Apr 2021 15:56:27 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:26 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 7/9] t9902: fix completion tests for log.d* to match log.diffMerges Date: Thu, 8 Apr 2021 01:56:06 +0300 Message-Id: <20210407225608.14611-8-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There were 3 completion tests failures due to introduction of log.diffMerges configuration variable that affected the result of completion of log.d. Fixed them accordingly. Signed-off-by: Sergey Organov --- t/t9902-completion.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 04ce884ef5ac..4d732d6d4f81 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2306,6 +2306,7 @@ test_expect_success 'git config - variable name' ' test_completion "git config log.d" <<-\EOF log.date Z log.decorate Z + log.diffMerges Z EOF ' @@ -2327,6 +2328,7 @@ test_expect_success 'git -c - variable name' ' test_completion "git -c log.d" <<-\EOF log.date=Z log.decorate=Z + log.diffMerges=Z EOF ' @@ -2348,6 +2350,7 @@ test_expect_success 'git clone --config= - variable name' ' test_completion "git clone --config=log.d" <<-\EOF log.date=Z log.decorate=Z + log.diffMerges=Z EOF ' From patchwork Wed Apr 7 22:56:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189533 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 C4235C433B4 for ; Wed, 7 Apr 2021 22:56:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A241A61245 for ; Wed, 7 Apr 2021 22:56:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229752AbhDGW4q (ORCPT ); Wed, 7 Apr 2021 18:56:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229714AbhDGW4j (ORCPT ); Wed, 7 Apr 2021 18:56:39 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 809ADC061761 for ; Wed, 7 Apr 2021 15:56:29 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 12so659152lfq.13 for ; Wed, 07 Apr 2021 15:56:29 -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 :mime-version:content-transfer-encoding; bh=fSufVESFUZxLaqvuw9F6uJ7WIMbdkU1GY5L/Gl9yax0=; b=Hv08iR9yt0fJ9qw5XCvuxmXnu0w/Fwt4fzY6sCyzYknBtdJfhTRizOteqC8dsfiAJS RDD8va073jjLfP4CsPnfWDxn4FwyTWRwpAKpkBKlp+Onp6RfU3N/axzJLRA8AyENxeib wS894XVOVmAd+DxfDJQfUGupw+ipT3TLTiPD+DYxC1y4V0nvhSnSZZvH3Mm6BBDgiq32 qaCJqxiqWYTY+YKK17a+s5v6+v9TTNGRbUCr+wnBY8jNe2aWmhRYTnMaRbc9tLsUfQF1 Kkvd6cDshk9UMFnFh9Vg1ukG+e/OC1Pk0UoT1r3UlEv1OHaneNsvHm42Hu6hqZfRCS0x dQ4g== 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=fSufVESFUZxLaqvuw9F6uJ7WIMbdkU1GY5L/Gl9yax0=; b=fMOp0UQYBiIrNjy5W7xVksaSmk/pAmlA5Y6ng7Wadtqd8K/xktt7yKLcnnwBqMYc+u Svt9VkNmveeeglfHZf4FGlj5fmE+XYNuLgBT8+LMls+VmkvD1JrIM9c3AlXQ6Dp5rtlc MQZQHEYlm4vcOBUPDgWRP+BsZoyCJvM87rBQpUBD5ok0QjGm27GM7M5rmDXfRBo4qOux 4vQ6ioLTqAYXkqpVrMO0EemyipfWesrnML0s9mOm8KJdoGaQme5UTDfZ2q+rKaKpZJ92 Qv7p76uSpDPs1zDNMN5zaZa4Xq4lLoaZan8HrO15uppWunsRGY5ZnVfrKczrkcpAOMxM RDhg== X-Gm-Message-State: AOAM533M7+t0yReYIsAkrSzMJ99w07pagIY77sNkqMCJzyLBBA95mzAR gAwiljrrLsxHNeeLt0lk3CE= X-Google-Smtp-Source: ABdhPJxKKh2u18it4B9timM6pvB2xN0cMGgg/GQeQtwCftzA3fMFDdo3HmroIqJp7zI6uZEJruK/qg== X-Received: by 2002:a05:6512:1318:: with SMTP id x24mr3675914lfu.376.1617836188100; Wed, 07 Apr 2021 15:56:28 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:27 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 8/9] doc/diff-options: document new --diff-merges features Date: Thu, 8 Apr 2021 01:56:07 +0300 Message-Id: <20210407225608.14611-9-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Document changes in -m and --diff-merges=m semantics, as well as new --diff-merges=def option. Signed-off-by: Sergey Organov --- Documentation/diff-options.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index aa2b5c11f20b..09b07231b5a4 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -34,7 +34,7 @@ endif::git-diff[] endif::git-format-patch[] ifdef::git-log[] ---diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc):: +--diff-merges=(off|none|def|first-parent|1|separate|m|combined|c|dense-combined|cc):: --no-diff-merges:: Specify diff format to be used for merge commits. Default is {diff-merges-default} unless `--first-parent` is in use, in which case @@ -45,17 +45,24 @@ ifdef::git-log[] Disable output of diffs for merge commits. Useful to override implied value. + +--diff-merges=def::: +--diff-merges=m::: +-m::: + This option makes diff output for merge commits to be shown in + the default format. `-m` will produce the output only if `-p` + is given as well. The default format could be changed using + `log.diffMerges` configuration parameter, which default value + is `separate`. ++ --diff-merges=first-parent::: --diff-merges=1::: This option makes merge commits show the full diff with respect to the first parent only. + --diff-merges=separate::: ---diff-merges=m::: --m::: This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated - for each parent. `-m` doesn't produce any output without `-p`. + for each parent. + --diff-merges=combined::: --diff-merges=c::: From patchwork Wed Apr 7 22:56:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12189535 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 9B379C433B4 for ; Wed, 7 Apr 2021 22:56:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 74A1161242 for ; Wed, 7 Apr 2021 22:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229741AbhDGW4s (ORCPT ); Wed, 7 Apr 2021 18:56:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229739AbhDGW4m (ORCPT ); Wed, 7 Apr 2021 18:56:42 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52EF7C061762 for ; Wed, 7 Apr 2021 15:56:30 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id s17so22658096ljc.5 for ; Wed, 07 Apr 2021 15:56:30 -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 :mime-version:content-transfer-encoding; bh=lhQ+fJBRJyQWN/9jDex6ODU49KsIhHVvz0QPimAkkH8=; b=UCM2FYU6V2E7KYFDAfGEuHXXkzuwPjVWlau+eXt0ibr5wUu4Yr1VEHaleS68mbB0sg OKmGANy6X95zN4LmHuBTAA5Eq4BhIKwNiPvXXfkSiJClU3X/m/G7Eg6ON2TyybelxsX5 v3sR3c5BGjSu6OXCCnuXZ3mAKNqSV6hMM07+rKCgI3SCjhU/ztB7Ky6aXqWYNGLqgdnI y2jcGrq0DtYpW4vxixEl9+ZTgoz/7NunoynH1Re/2dxDASmYZNdkEE5axAs5r2ZIdjUi 6QEht7so2bF6Sw/9JrdvwZwWym+FsVaJvyikhJ6//eTn24d1wocd6+UGOS1Bsp4sM05x kkRw== 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=lhQ+fJBRJyQWN/9jDex6ODU49KsIhHVvz0QPimAkkH8=; b=Kx1iQdKGYj8MZn/HiuJN2FMAvzlGlo3GPvrSkkE7PBXSiRVIu6P9u3kN71uuDe8jbG swgUeOTDuA2XfIGpE41EwMlFc9yDV3xs+pl7KAEvCTQ3BLcUoFQvPgd5900qhAiSaeqU GbqlSNGDJymF7Kzxzf0a8cvYUxni/EZx7DtRoqTDFCIDXHvhFNZQAPXIGpJ8EDHI6OkZ b7Rz1f+KdKFD1z6NJ1U6nyi/tknbF5oE/eIc4QGJ4YvzxtST+fi8tfjok9v4/N50M4xo JOANpAl//w/78BMTuTSXYeO1Cv8xvkCBUe8d4j0LtYZmfJTU6q7NvU+DMetJcDqOJYoP aCYA== X-Gm-Message-State: AOAM5316oCl5bKk1K07BcymM6QR+PMMcTIBOCp6eJJYBObVbLDu1uUGo eYxbzoNwckYGCw0/KEakvpOV43UUHIE= X-Google-Smtp-Source: ABdhPJycFMqjz+w5I2eGS9ATG0ivAB7sGI5uvlxVgCA2c1ORV9sJO/u3X4qe0DOf978dj5OEMLcBHg== X-Received: by 2002:a2e:1649:: with SMTP id 9mr3765846ljw.74.1617836188939; Wed, 07 Apr 2021 15:56:28 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id t25sm2580101ljo.102.2021.04.07.15.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:28 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , git@vger.kernel.org, Sergey Organov Subject: [PATCH 9/9] doc/config: document log.diffMerges Date: Thu, 8 Apr 2021 01:56:08 +0300 Message-Id: <20210407225608.14611-10-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> References: <20210407225608.14611-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Added documentation for the new log.diffMerges configuration option. Signed-off-by: Sergey Organov --- Documentation/config/log.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 208d5fdcaa68..456eb07800cb 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -24,6 +24,11 @@ log.excludeDecoration:: the config option can be overridden by the `--decorate-refs` option. +log.diffMerges:: + Set default diff format to be used for merge commits. See + `--diff-merges` in linkgit:git-log[1] for details. + Defaults to `separate`. + log.follow:: If `true`, `git log` will act as if the `--follow` option was used when a single is given. This has the same limitations as `--follow`,