From patchwork Sun Nov 27 09:37:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 13056659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0621CC4321E for ; Sun, 27 Nov 2022 09:37:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229515AbiK0Jhi (ORCPT ); Sun, 27 Nov 2022 04:37:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbiK0Jhf (ORCPT ); Sun, 27 Nov 2022 04:37:35 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3079E63E0 for ; Sun, 27 Nov 2022 01:37:33 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id j16so13111148lfe.12 for ; Sun, 27 Nov 2022 01:37:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qVuffSjGlZkl39WnWxc51gP5iV9UlbvC+C6zYhHErIM=; b=PrTaY2kxb7arHH5HMtBYzh9dQ4idvkrl7T9BAylcuRXv/8GAxA6CDL23WDRUQ6LiBT 06/23KkXC9CkamFukhbbq3MwO80YQfDlu9iQ08aJWasta4d0Ov0cEEzCF70MnHOX1qEa SR62ghParmcK49zKgdrrSn0IJfhzDH9JP4Go2s+D3WnR4P9PtRtGr5+cJxmOhFPuWuLc anjfAQUW52mqPO5iMzGfQDppNzGWJF0uNlPYrv7sFhwGfvCW5xkK7tT+Z+uRwJALe3Ve TnF4cq2u3X/SQ86EPupz/imuokrHIYsYA4QH8nH7PCtnEqHZS+N1jIjE95CQn6ruvoAg /OKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qVuffSjGlZkl39WnWxc51gP5iV9UlbvC+C6zYhHErIM=; b=gidEiqyIA8p+EVrTSFN3M1lY/ASAsjK6Fg0JnOgG+TLM0SAW4XkDDrE4s7DzLy8+IX gatWw5b75EnO3qMYm26Dlr6HuBchb9XbtWF9ayfRU7ZjXUaIjzdWdpDLxl5bg0fdArpB G/Cp6ubQTLqvVZ1B+Zz+GUC2KHCMLCH9Cu2U2/chHSJ9JS6wzIDMXqvDF7F9zg26fxfE P/M3iGp8Ai0tMyfu5IJdm+HS58H0xjF9WsnVJBIVqwXS4GZZHk2MWjl36M2SNBfpNYJW kZua4zJQHK1GAoVzVbr+oQ/+/vsq5r8kr1vES8UGwOCUo+a3c80+eyzqZRdfGbVqg4kB 3Tpw== X-Gm-Message-State: ANoB5pnJmWz3MqkeBE2dKzZHZu5rmrr2up+bVKzgEGpOZRBuV4u1bvqD iAT7Mc2pcUCXuHOhX2zIyS0= X-Google-Smtp-Source: AA0mqf4gNkEsDOUN9lfFtoDzwsZu3U7m6GMZkEgzEW0byIPfnU8hKwO3qKfqo9ME1DYTGHol8bg4xw== X-Received: by 2002:a19:7404:0:b0:4aa:bdfb:75b8 with SMTP id v4-20020a197404000000b004aabdfb75b8mr10015591lfe.175.1669541851237; Sun, 27 Nov 2022 01:37:31 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id bd3-20020a05651c168300b002770a48fd12sm835615ljb.102.2022.11.27.01.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 01:37:30 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Alex Henrie , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH 1/5] diff-merges: implement [no-]hide option and log.diffMergesHide config Date: Sun, 27 Nov 2022 12:37:17 +0300 Message-Id: <20221127093721.31012-2-sorganov@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221127093721.31012-1-sorganov@gmail.com> References: <20221127093721.31012-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The set of diff-merges options happened to be incomplete, and failed to implement exact semantics of -m option that hides output of diffs for merge commits unless -p option is active as well. The new "hide" option fixes this issue, so that now --diff-merges=on --diff-merges=hide combo is the exact synonym for -m. The log.diffMerges configuration also accepts "hide" and "no-hide" values, and governs the default value for the hide bit. The configuration behaves as if "--diff-merges=[no-]hide" is inserted first in the command-line. New log.diffMergesHide boolean configuration is implemented as well, for the case when log.diffMerges is already in use for specifying the format. Signed-off-by: Sergey Organov --- Documentation/config/log.txt | 6 +++ Documentation/diff-options.txt | 13 +++-- builtin/log.c | 2 + diff-merges.c | 40 ++++++++++++-- diff-merges.h | 2 + t/t4013-diff-various.sh | 54 ++++++++++++++++++- ...ges=first-parent_--diff-merges=hide_master | 34 ++++++++++++ t/t9902-completion.sh | 3 ++ 8 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 t/t4013/diff.log_--diff-merges=first-parent_--diff-merges=hide_master diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index cbe34d759221..9c6be643bcf6 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -33,6 +33,12 @@ log.diffMerges:: Set diff format to be used when `--diff-merges=on` is specified, see `--diff-merges` in linkgit:git-log[1] for details. Defaults to `separate`. ++ +When used with 'hide' or 'no-hide', sets the default hiding of +diffs for merge commits when `-p` option is not used. + +log.diffMergesHide:: + `true` implies `--diff-merges=hide` option. log.follow:: If `true`, `git log` will act as if the `--follow` option was used when diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 3674ac48e92c..351d51215717 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|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r):: +--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r|[no-]hide):: --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 @@ -49,10 +49,11 @@ ifdef::git-log[] --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 + the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. ++ + `-m` is a shortcut for '--diff-merges=on --diff-merges=hide' + --diff-merges=first-parent::: --diff-merges=1::: @@ -72,6 +73,12 @@ ifdef::git-log[] with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit. + +--diff-merges=hide::: +--diff-merges=no-hide::: + Hide (do not hide) the diff for merge commits unless `-p` options is given + as well. The default `no-hide` could be changed using `log.diffMerges` + configuration parameter. ++ The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented). diff --git a/builtin/log.c b/builtin/log.c index 56e2d95e869d..e031021e53b2 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -581,6 +581,8 @@ static int git_log_config(const char *var, const char *value, void *cb) } if (!strcmp(var, "log.diffmerges")) return diff_merges_config(value); + if (!strcmp(var, "log.diffmergeshide")) + return diff_merges_hide_config(git_config_bool(var, 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 85cbefa5afd7..55fe5b70c102 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -7,6 +7,7 @@ static void set_separate(struct rev_info *revs); static diff_merges_setup_func_t set_to_default = set_separate; static int suppress_m_parsing; +static int hide = 0; static void suppress(struct rev_info *revs) { @@ -20,10 +21,15 @@ static void suppress(struct rev_info *revs) revs->remerge_diff = 0; } +static void set_need_diff(struct rev_info *revs) +{ + revs->merges_need_diff = !hide; +} + static void common_setup(struct rev_info *revs) { suppress(revs); - revs->merges_need_diff = 1; + set_need_diff(revs); } static void set_none(struct rev_info *revs) @@ -31,6 +37,18 @@ static void set_none(struct rev_info *revs) suppress(revs); } +static void set_hide(struct rev_info *revs) +{ + hide = 1; + set_need_diff(revs); +} + +static void set_no_hide(struct rev_info *revs) +{ + hide = 0; + set_need_diff(revs); +} + static void set_separate(struct rev_info *revs) { common_setup(revs); @@ -69,6 +87,10 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg) { if (!strcmp(optarg, "off") || !strcmp(optarg, "none")) return set_none; + if (!strcmp(optarg, "hide")) + return set_hide; + if (!strcmp(optarg, "no-hide")) + return set_no_hide; if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent")) return set_first_parent; if (!strcmp(optarg, "separate")) @@ -105,7 +127,19 @@ int diff_merges_config(const char *value) if (!func) return -1; - set_to_default = func; + if (func == set_hide) + hide = 1; + else if (func == set_no_hide) + hide = 0; + else + set_to_default = func; + + return 0; +} + +int diff_merges_hide_config(int on) +{ + hide = on; return 0; } @@ -122,7 +156,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) if (!suppress_m_parsing && !strcmp(arg, "-m")) { set_to_default(revs); - revs->merges_need_diff = 0; + set_hide(revs); } else if (!strcmp(arg, "-c")) { set_combined(revs); revs->merges_imply_patch = 1; diff --git a/diff-merges.h b/diff-merges.h index 19639689bb05..e86e5381693b 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -11,6 +11,8 @@ struct rev_info; int diff_merges_config(const char *value); +int diff_merges_hide_config(int hide); + void diff_merges_suppress_m_parsing(void); int diff_merges_parse_opts(struct rev_info *revs, const char **argv); diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index dfcf3a0aaae3..4fc8ba2fc59c 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -334,6 +334,7 @@ log --first-parent --diff-merges=off -p master log -p --first-parent master log -p --diff-merges=first-parent master log --diff-merges=first-parent master +log --diff-merges=first-parent --diff-merges=hide master log -m -p --first-parent master log -m -p master log --cc -m -p master @@ -460,7 +461,18 @@ EOF test_expect_success 'log -m matches pure log' ' git log master >result && process_diffs result >expected && - git log -m >result && + git log -m master >result && + process_diffs result >actual && + test_cmp expected actual +' + +test_expect_success 'log --diff-merges=on matches -m only with --diff-merges=hide' ' + git log -m master >result && + process_diffs result >expected && + git log --diff-merges=on master >result && + process_diffs result >actual && + ! test_cmp expected actual && + git log --diff-merges=on --diff-merges=hide master >result && process_diffs result >actual && test_cmp expected actual ' @@ -496,6 +508,46 @@ test_expect_success 'git config log.diffMerges first-parent vs -m' ' test_cmp expected actual ' +test_expect_success 'git config log.diffMerges hide: has effect' ' + git log --diff-merges=on master >result && + process_diffs result >no-hide && + test_config log.diffMerges hide && + git log --diff-merges=on master >result && + process_diffs result >hide && + ! test_cmp no-hide hide +' + +test_expect_success 'git config log.diffMerges no-hide: is the default' ' + git log --diff-merges=on master >result && + process_diffs result >default && + test_config log.diffMerges no-hide && + git log --diff-merges=on master >result && + process_diffs result >no-hide && + test_cmp default no-hide +' + +# As "-m" is synonym for "--diff-merges=hide --diff-merges=on", the +# "log.diffMerges=hide" configuration should have no effect on "-m" +test_expect_success 'git config log.diffMerges hide: has no effect on -m' ' + git log -m master >result && + process_diffs result >expected && + test_config log.diffMerges hide && + git log -m master >result && + process_diffs result >actual && + test_cmp expected actual +' + +# As "--cc" implies "-p", the "log.diffMerges=hide" configuration +# should have no effect on "--cc" +test_expect_success 'git config log.diffMerges hide: has no effect on --cc' ' + git log --cc master >result && + process_diffs result >expected && + test_config log.diffMerges hide && + git log --cc master >result && + process_diffs result >actual && + test_cmp expected actual +' + # -m in "git diff-index" means "match missing", that differs # from its meaning in "git diff". Let's check it in diff-index. # The line in the output for removed file should disappear when diff --git a/t/t4013/diff.log_--diff-merges=first-parent_--diff-merges=hide_master b/t/t4013/diff.log_--diff-merges=first-parent_--diff-merges=hide_master new file mode 100644 index 000000000000..596caec64298 --- /dev/null +++ b/t/t4013/diff.log_--diff-merges=first-parent_--diff-merges=hide_master @@ -0,0 +1,34 @@ +$ git log --diff-merges=first-parent --diff-merges=hide master +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 +Merge: 9a6d494 c7a2ab9 +Author: A U Thor +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + +commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a +Author: A U Thor +Date: Mon Jun 26 00:03:00 2006 +0000 + + Side + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + +commit 444ac553ac7612cc88969031b02b3767fb8a353a +Author: A U Thor +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 43de868b8005..fc6b0722216a 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2497,6 +2497,7 @@ test_expect_success 'git config - variable name' ' log.date Z log.decorate Z log.diffMerges Z + log.diffMergesHide Z EOF ' @@ -2525,6 +2526,7 @@ test_expect_success 'git -c - variable name' ' log.date=Z log.decorate=Z log.diffMerges=Z + log.diffMergesHide=Z EOF ' @@ -2547,6 +2549,7 @@ test_expect_success 'git clone --config= - variable name' ' log.date=Z log.decorate=Z log.diffMerges=Z + log.diffMergesHide=Z EOF ' From patchwork Sun Nov 27 09:37:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 13056660 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED09BC4321E for ; Sun, 27 Nov 2022 09:37:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229527AbiK0Jhk (ORCPT ); Sun, 27 Nov 2022 04:37:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229513AbiK0Jhg (ORCPT ); Sun, 27 Nov 2022 04:37:36 -0500 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63E271136 for ; Sun, 27 Nov 2022 01:37:34 -0800 (PST) Received: by mail-lj1-x233.google.com with SMTP id b9so9890665ljr.5 for ; Sun, 27 Nov 2022 01:37:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AMDU0mhFWpC9bYffKO6uPKev2QDu0cxQKIRbfvee2yE=; b=XxyptKjcyQj23I8UZdvTDCS6+MsdM8O2fRriMHHwj+r4cZf6XiRMGj2Nf63CJTlSsL 5iFWI2pzH7vELDJk7VIz6wegrFraV32Bx9X2/ZNYSiSg42qlr/xnmMo1iaiuawBVqZcD +lyHqRBUWpIiaz5qumk9G93vQyhofgkJYJSzDi/M/5XgFTIbYOXn1pttQ9r1rMJ0je+/ jtJ2mT8O6TcrAv9VlLvPU9Xa2jFkNTN16n3NWmPEK2WlM4wYCtXaJBsZ1b1J/zhCiHHX YIwUhnzTtej6MZJUa7gU5LJvHYPzzcncEB2UAcy0vTY8Cn//ACJLs9toBspi8aa5feky 9ehg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AMDU0mhFWpC9bYffKO6uPKev2QDu0cxQKIRbfvee2yE=; b=OZRipKq3tduPGKoBzYjvezNFN0MsbUkt7a1AjW6xlK1+GvSIjKFKwC56D+ZpG2aUYi uJAJ2FzVCuOKfdeh/0WqhrkrWHQfz2O8r0JW8oKBuJiSsz8qqiZ+Z012Te9GHbIiPPEg UyTkd9bOP3zAEDsdWdlBCkNnM3cC1oeqUDCsdRzlGh58F2Fa4OZgpBG32vpaZUJGU6bA 9h5uIuVPo1Y6dOmdNIH/n1LynjK3r76+f37gUE266cYiRedOkniEK+9icV/0WJ0gS7z7 4Q14Hf7ZtLzSARasHVcLpUvgTpaz3jI7GuDNAJ/USlQuj43+plJzwtZXRM05lkcHunPL /wHA== X-Gm-Message-State: ANoB5pn/mHCYBjKSiTLIuDC/VzEbUR36rwF3C2fW3hSdYxaXk5tEvqIQ 5RCK93e9qmf0q4XWC8GGdd4= X-Google-Smtp-Source: AA0mqf6Innphr5V8vaJoJRMc2380WKRSt9Y84pm+ztRgZBqEH8zBcbOSssUYh9lxrs1sTwzAQZ7dwg== X-Received: by 2002:a2e:be87:0:b0:277:f0f:927e with SMTP id a7-20020a2ebe87000000b002770f0f927emr15747654ljr.138.1669541852466; Sun, 27 Nov 2022 01:37:32 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id bd3-20020a05651c168300b002770a48fd12sm835615ljb.102.2022.11.27.01.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 01:37:31 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Alex Henrie , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH 2/5] diff-merges: implement log.diffMerges-m-imply-p config Date: Sun, 27 Nov 2022 12:37:18 +0300 Message-Id: <20221127093721.31012-3-sorganov@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221127093721.31012-1-sorganov@gmail.com> References: <20221127093721.31012-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Historically, `-m` doesn't imply `-p` whereas similar `-c` and `--cc` options do. Simply fixing this inconsistency by unconditional modification of `-m` semantics appeared to be a bad idea, as it broke some legacy scripts. Implement "log.diffMerges-m-imply-p" boolean configuration variable that allows user to enable implication of `-p` by `-m`. Signed-off-by: Sergey Organov --- Documentation/config/log.txt | 3 +++ Documentation/diff-options.txt | 6 ++++-- builtin/log.c | 2 ++ diff-merges.c | 8 ++++++++ diff-merges.h | 2 ++ t/t4013-diff-various.sh | 9 +++++++++ t/t9902-completion.sh | 3 +++ 7 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 9c6be643bcf6..265a57312e58 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -40,6 +40,9 @@ diffs for merge commits when `-p` option is not used. log.diffMergesHide:: `true` implies `--diff-merges=hide` option. +log.diffMerges-m-imply-p:: + `true` enables implication of `-p` by `-m`. + 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`, diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 351d51215717..e64066af8d96 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -48,12 +48,14 @@ ifdef::git-log[] --diff-merges=on::: --diff-merges=m::: -m::: - This option makes diff output for merge commits to be shown in + These options make diff output for merge commits to be shown in the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`. + - `-m` is a shortcut for '--diff-merges=on --diff-merges=hide' + `-m` is a shortcut for '--diff-merges=on --diff-merges=hide'. + In addition it implies `-p` when `log.diffMerges-m-imply-p` is + active. + --diff-merges=first-parent::: --diff-merges=1::: diff --git a/builtin/log.c b/builtin/log.c index e031021e53b2..332b5e478cc5 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -583,6 +583,8 @@ static int git_log_config(const char *var, const char *value, void *cb) return diff_merges_config(value); if (!strcmp(var, "log.diffmergeshide")) return diff_merges_hide_config(git_config_bool(var, value)); + if (!strcmp(var, "log.diffmerges-m-imply-p")) + return diff_merges_m_imply_p_config(git_config_bool(var, 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 55fe5b70c102..1fbf476d378e 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -8,6 +8,7 @@ static void set_separate(struct rev_info *revs); static diff_merges_setup_func_t set_to_default = set_separate; static int suppress_m_parsing; static int hide = 0; +static int m_imply_p = 0; static void suppress(struct rev_info *revs) { @@ -143,6 +144,12 @@ int diff_merges_hide_config(int on) return 0; } +int diff_merges_m_imply_p_config(int on) +{ + m_imply_p = on; + return 0; +} + void diff_merges_suppress_m_parsing(void) { suppress_m_parsing = 1; @@ -157,6 +164,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) if (!suppress_m_parsing && !strcmp(arg, "-m")) { set_to_default(revs); set_hide(revs); + revs->merges_imply_patch = m_imply_p; } else if (!strcmp(arg, "-c")) { set_combined(revs); revs->merges_imply_patch = 1; diff --git a/diff-merges.h b/diff-merges.h index e86e5381693b..9f0b3901fe82 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -13,6 +13,8 @@ int diff_merges_config(const char *value); int diff_merges_hide_config(int hide); +int diff_merges_m_imply_p_config(int on); + void diff_merges_suppress_m_parsing(void); int diff_merges_parse_opts(struct rev_info *revs, const char **argv); diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 4fc8ba2fc59c..1789dd6063c5 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -548,6 +548,15 @@ test_expect_success 'git config log.diffMerges hide: has no effect on --cc' ' test_cmp expected actual ' +test_expect_success 'git config log.diffMerges-m-imply-p has proper effect' ' + git log -m -p master >result && + process_diffs result >expected && + test_config log.diffMerges-m-imply-p true && + git log -m master >result && + process_diffs result >actual && + test_cmp expected actual +' + # -m in "git diff-index" means "match missing", that differs # from its meaning in "git diff". Let's check it in diff-index. # The line in the output for removed file should disappear when diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index fc6b0722216a..26a7e4ff877c 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2498,6 +2498,7 @@ test_expect_success 'git config - variable name' ' log.decorate Z log.diffMerges Z log.diffMergesHide Z + log.diffMerges-m-imply-p Z EOF ' @@ -2527,6 +2528,7 @@ test_expect_success 'git -c - variable name' ' log.decorate=Z log.diffMerges=Z log.diffMergesHide=Z + log.diffMerges-m-imply-p=Z EOF ' @@ -2550,6 +2552,7 @@ test_expect_success 'git clone --config= - variable name' ' log.decorate=Z log.diffMerges=Z log.diffMergesHide=Z + log.diffMerges-m-imply-p=Z EOF ' From patchwork Sun Nov 27 09:37:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 13056661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59974C352A1 for ; Sun, 27 Nov 2022 09:37:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229563AbiK0Jhn (ORCPT ); Sun, 27 Nov 2022 04:37:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbiK0Jhi (ORCPT ); Sun, 27 Nov 2022 04:37:38 -0500 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5445595B7 for ; Sun, 27 Nov 2022 01:37:35 -0800 (PST) Received: by mail-lf1-x136.google.com with SMTP id bp15so13085003lfb.13 for ; Sun, 27 Nov 2022 01:37:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4wEZkkHdatuTxvzbDqh8EP4XGFfpsIgKyB6MbLC2OJY=; b=kGvsiPOBMOHqDT3SXjeRoXkgY/sXoP96br1Kk7m3jkECihtAoYJ95m32je+uRwn8z3 mYxVZvD4/pz3iBcwgyp5t22YdLv77W3GneMImB21gb/gHfKjcjC5+XWFaHFr2nuspuwL dWcJTdogvkesvijJGE18MEgO++TTocordLazCTBUa+0yebekP+KA1KEdUJdYkDFlBfDj cho8JD6AQv4iEjOdpjBJ3DJtRYXQTYbymgLmj0lpBuLCcjtIoukisXKk1qzUfuOEdPcA gdMAPj8TiybS/XwB8ymcGYt1l5wq0eqq7e/tduRVUX76raGdAR4/C10WfwFuqGqnTd2R sEvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4wEZkkHdatuTxvzbDqh8EP4XGFfpsIgKyB6MbLC2OJY=; b=Yo1p1PtKFDLPALHZIwiFR2O8lrltEMi53Yd09IE/XOjJCc1nKO/iWSrtUXyHqUMrWs 1PIajujcNHWONPJbcczPX8hqgR9IkcThBrftxLb3EvTT2Q8R211aa2OeezpSYYQ4NaVV e1AJ8MtJuEVh+xg3UQbAc5HVJ9SXXI0U0uNsY5e/7VwgYuTcFSZpIYdJxKbuC2UNEdFJ AvxYOECwy8ogn6DPNdrFhgknPoKAPTENQdDpOKwYCSlh3nxJJ0BbICLQ04DQe2EKTCP2 39E3M1GynY62fp1uh5ZW4lh/61ARpT0T37F2ulv0WaySdXDi46B1eLzd0jVCgcjeajov uHoQ== X-Gm-Message-State: ANoB5pnYOmnzlDKwO67LTBpX75Fi75McSzAs4yttRx8frQ8/n+uI2aq6 0/IOr1hkvDnWCva6rk5whIM= X-Google-Smtp-Source: AA0mqf5tLgjj4YKyPiyapgo0ADpMdMQ2/GbwjjoSarcf2trHnSrkYKX9ziyIbyU6d9RLhnUg+aXJpw== X-Received: by 2002:a05:6512:606:b0:4b1:2aab:7cbf with SMTP id b6-20020a056512060600b004b12aab7cbfmr12338561lfe.499.1669541853482; Sun, 27 Nov 2022 01:37:33 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id bd3-20020a05651c168300b002770a48fd12sm835615ljb.102.2022.11.27.01.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 01:37:32 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Alex Henrie , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH 3/5] diff-merges: implement log.diffMergesForce config Date: Sun, 27 Nov 2022 12:37:19 +0300 Message-Id: <20221127093721.31012-4-sorganov@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221127093721.31012-1-sorganov@gmail.com> References: <20221127093721.31012-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Force specified log format for -c, --cc, and --remerge-diff options instead of their respective formats. The override is useful when some external tool hard-codes diff for merges format option. Using any of the above options twice or more will get back the original meaning of the option no matter what configuration says. Signed-off-by: Sergey Organov --- Documentation/config/log.txt | 11 +++++++++++ builtin/log.c | 2 ++ diff-merges.c | 32 ++++++++++++++++++++++++++------ diff-merges.h | 2 ++ t/t4013-diff-various.sh | 18 ++++++++++++++++++ t/t9902-completion.sh | 3 +++ 6 files changed, 62 insertions(+), 6 deletions(-) diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 265a57312e58..7452c7fad638 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -43,6 +43,17 @@ log.diffMergesHide:: log.diffMerges-m-imply-p:: `true` enables implication of `-p` by `-m`. +log.diffMergesForce:: + Use specified log format for -c, --cc, and --remerge-diff + options instead of their respective formats when the option + appears on the command line one time. See `--diff-merges` in + linkgit:git-log[1] for allowed values. Using 'off' or 'none' + disables the override (default). ++ +The override is useful when external tool hard-codes one of the above +options. Using any of these options two (or more) times will get back +the original meaning of the options. + 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`, diff --git a/builtin/log.c b/builtin/log.c index 332b5e478cc5..1e8d0a2545a9 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -585,6 +585,8 @@ static int git_log_config(const char *var, const char *value, void *cb) return diff_merges_hide_config(git_config_bool(var, value)); if (!strcmp(var, "log.diffmerges-m-imply-p")) return diff_merges_m_imply_p_config(git_config_bool(var, value)); + if (!strcmp(var, "log.diffmergesforce")) + return diff_merges_force_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 1fbf476d378e..cedd7652bf42 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -6,6 +6,7 @@ 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 diff_merges_setup_func_t force_func = NULL; static int suppress_m_parsing; static int hide = 0; static int m_imply_p = 0; @@ -150,6 +151,21 @@ int diff_merges_m_imply_p_config(int on) return 0; } +int diff_merges_force_config(const char *value) +{ + diff_merges_setup_func_t func = func_by_opt(value); + + if (!func) + return -1; + + if (func == set_none) + force_func = NULL; + else if (func != set_hide && func != set_no_hide) + force_func = func; + + return 0; +} + void diff_merges_suppress_m_parsing(void) { suppress_m_parsing = 1; @@ -160,20 +176,18 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) int argcount = 1; const char *optarg; const char *arg = argv[0]; + diff_merges_setup_func_t set_func = NULL; if (!suppress_m_parsing && !strcmp(arg, "-m")) { set_to_default(revs); set_hide(revs); revs->merges_imply_patch = m_imply_p; } else if (!strcmp(arg, "-c")) { - set_combined(revs); - revs->merges_imply_patch = 1; + set_func = set_combined; } else if (!strcmp(arg, "--cc")) { - set_dense_combined(revs); - revs->merges_imply_patch = 1; + set_func = set_dense_combined; } else if (!strcmp(arg, "--remerge-diff")) { - set_remerge_diff(revs); - revs->merges_imply_patch = 1; + set_func = set_remerge_diff; } else if (!strcmp(arg, "--no-diff-merges")) { set_none(revs); } else if (!strcmp(arg, "--combined-all-paths")) { @@ -183,6 +197,12 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) } else return 0; + if (set_func != NULL) { + (force_func ? force_func : set_func)(revs); + force_func = NULL; + revs->merges_imply_patch = 1; + } + revs->explicit_diff_merges = 1; return argcount; } diff --git a/diff-merges.h b/diff-merges.h index 9f0b3901fe82..6ef0cc87bb2a 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -15,6 +15,8 @@ int diff_merges_hide_config(int hide); int diff_merges_m_imply_p_config(int on); +int diff_merges_force_config(const char *value); + void diff_merges_suppress_m_parsing(void); int diff_merges_parse_opts(struct rev_info *revs, const char **argv); diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 1789dd6063c5..8a90d2dac360 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -557,6 +557,24 @@ test_expect_success 'git config log.diffMerges-m-imply-p has proper effect' ' test_cmp expected actual ' +test_expect_success 'git config log.diffMergesForce has proper effect' ' + git log -m -p master >result && + process_diffs result >expected && + test_config log.diffMergesForce on && + git log --cc master >result && + process_diffs result >actual && + test_cmp expected actual +' + +test_expect_success 'git config log.diffMergesForce override by duplicate' ' + git log --cc master >result && + process_diffs result >expected && + test_config log.diffMergesForce on && + git log --cc --cc master >result && + process_diffs result >actual && + test_cmp expected actual +' + # -m in "git diff-index" means "match missing", that differs # from its meaning in "git diff". Let's check it in diff-index. # The line in the output for removed file should disappear when diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 26a7e4ff877c..411e08b2fa1b 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2498,6 +2498,7 @@ test_expect_success 'git config - variable name' ' log.decorate Z log.diffMerges Z log.diffMergesHide Z + log.diffMergesForce Z log.diffMerges-m-imply-p Z EOF ' @@ -2528,6 +2529,7 @@ test_expect_success 'git -c - variable name' ' log.decorate=Z log.diffMerges=Z log.diffMergesHide=Z + log.diffMergesForce=Z log.diffMerges-m-imply-p=Z EOF ' @@ -2552,6 +2554,7 @@ test_expect_success 'git clone --config= - variable name' ' log.decorate=Z log.diffMerges=Z log.diffMergesHide=Z + log.diffMergesForce=Z log.diffMerges-m-imply-p=Z EOF ' From patchwork Sun Nov 27 09:37:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 13056662 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76C56C46467 for ; Sun, 27 Nov 2022 09:37:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbiK0Jho (ORCPT ); Sun, 27 Nov 2022 04:37:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229536AbiK0Jhi (ORCPT ); Sun, 27 Nov 2022 04:37:38 -0500 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 7A6369FEC for ; Sun, 27 Nov 2022 01:37:36 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id u27so2129520lfc.9 for ; Sun, 27 Nov 2022 01:37:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1Fgc+YoLF0b/LpR5Ofg/128bJacrMlzfnaw/bNKWcvI=; b=M3mtmCtcc1FEVMHlE8sVj7cVJDtnX7WVFkOOsHxtoCCtsf66rVFWRGY6VeEvFbzOXF MhdhD5ipRa0BdaGCGujn/A1/sRFxCAKFaqGk7DBcAEaWW6d8L/6m5ZeAcyBt7VLRJd9j zgiGTrZMqZAjoP4dT0sxshi8yrScZbtq/hMxaypp9vAINDua7MB2m0NY8jBLBSdjjdEO BT058dOtQ2k5enwbJ9gHkLSg3FRPB/csX0hgYwmbObYteWn2+iaCV0lLTJySGOvlBoTE gOAN0gnsGFDo+UYJ7VKcsGc+5mTuH7E+i+pm92GRpoCQ9PYT4HlXmAWJQtQfh9pjsXtn S88Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1Fgc+YoLF0b/LpR5Ofg/128bJacrMlzfnaw/bNKWcvI=; b=o0X+qwqLRy72BVVX0C3aNiSXp6X/QmMULCe8S+XXqEpZAIchKs9UPoJo92Sg5F6TVi tHb1lHp0LCe2MOVd/7EMWalX2yldEPcmmHqBDPZSFVbJZ3+UTLUqcP2Wzp+NccbTNw60 6QNMrwIdUVYlXr30rhnCQ07jcbANH/z7Y+BVSD6Ml2r/7eKnLZ+pJZvchDTN8OBJTv3s z+NpNWrIEAS/u7C2ezSAAuk0WKgGwvZDpu4HzavY3itqV8zmGYVm3MnDtLq5quATxqir cmGId9BRSqB8n0MS1SOpD/frfRqG14zKAY3PG0yCBmhdQV411JW4EB3q98eqo0mZiRcI FvMw== X-Gm-Message-State: ANoB5pnJEcHVXONgkI77s2J5mprT2Cn4cSZ71O+Sn8ZVGOKlL6WJ5e2l VCXt+gxRBzIofktBnQABoq8= X-Google-Smtp-Source: AA0mqf7a+7vMf5bBKK/v7ICxPiNhHuXfBHio0rqRb4bhD66thHinD+q/xH0bLVm8GLJUdWKlwWgGBg== X-Received: by 2002:ac2:5921:0:b0:4b3:cdf5:93f3 with SMTP id v1-20020ac25921000000b004b3cdf593f3mr15010788lfi.99.1669541854545; Sun, 27 Nov 2022 01:37:34 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id bd3-20020a05651c168300b002770a48fd12sm835615ljb.102.2022.11.27.01.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 01:37:34 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Alex Henrie , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH 4/5] diff-merges: support list of values for --diff-merges Date: Sun, 27 Nov 2022 12:37:20 +0300 Message-Id: <20221127093721.31012-5-sorganov@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221127093721.31012-1-sorganov@gmail.com> References: <20221127093721.31012-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Support comma-separated list of options in --diff-merges=. This allows for shorter: --diff-merges=on,hide instead of: --diff-merges=on --diff-merges=hide Signed-off-by: Sergey Organov --- Documentation/diff-options.txt | 5 +++-- diff-merges.c | 22 ++++++++++++++++++---- t/t4013-diff-various.sh | 8 ++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index e64066af8d96..46c98c87e24f 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -38,7 +38,8 @@ ifdef::git-log[] --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 - `first-parent` is the default. + `first-parent` is the default. Comma-separated list of + supported values is accepted as well. + --diff-merges=(off|none)::: --no-diff-merges::: @@ -53,7 +54,7 @@ ifdef::git-log[] `log.diffMerges` configuration parameter, which default value is `separate`. + - `-m` is a shortcut for '--diff-merges=on --diff-merges=hide'. + `-m` is a shortcut for '--diff-merges=on,hide'. In addition it implies `-p` when `log.diffMerges-m-imply-p` is active. + diff --git a/diff-merges.c b/diff-merges.c index cedd7652bf42..ddf9a411c49c 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -1,6 +1,7 @@ #include "diff-merges.h" #include "revision.h" +#include "strbuf.h" typedef void (*diff_merges_setup_func_t)(struct rev_info *); static void set_separate(struct rev_info *revs); @@ -110,12 +111,25 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg) static void set_diff_merges(struct rev_info *revs, const char *optarg) { - diff_merges_setup_func_t func = func_by_opt(optarg); + char const delim = ','; + struct strbuf **opts = strbuf_split_str(optarg, delim, -1); + struct strbuf **p; - if (!func) - die(_("invalid value for '%s': '%s'"), "--diff-merges", optarg); + for (p = opts; *p; p++) { + diff_merges_setup_func_t func; + char *opt = (*p)->buf; + int len = (*p)->len; - func(revs); + if (opt[len - 1] == delim) + opt[len - 1] = '\0'; + func = func_by_opt(opt); + if (!func) { + strbuf_list_free(opts); + die(_("invalid value for '%s': '%s'"), "--diff-merges", opt); + } + func(revs); + } + strbuf_list_free(opts); } /* diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 8a90d2dac360..2c68d06074ed 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -485,6 +485,14 @@ test_expect_success 'log --diff-merges=on matches --diff-merges=separate' ' test_cmp expected actual ' +test_expect_success 'log --diff-merges=,' ' + git log --diff-merges=1,hide master >result && + process_diffs result >expected && + git log --diff-merges=1 --diff-merges=hide master >result && + process_diffs result >actual && + test_cmp expected actual +' + test_expect_success 'deny wrong log.diffMerges config' ' test_config log.diffMerges wrong-value && test_expect_code 128 git log From patchwork Sun Nov 27 09:37:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 13056663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09BA4C4321E for ; Sun, 27 Nov 2022 09:37:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbiK0Jhr (ORCPT ); Sun, 27 Nov 2022 04:37:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbiK0Jhi (ORCPT ); Sun, 27 Nov 2022 04:37:38 -0500 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 CB6D1A456 for ; Sun, 27 Nov 2022 01:37:37 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id g7so13144550lfv.5 for ; Sun, 27 Nov 2022 01:37:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yvf81xkqWfodb8THj0KEuhk8sI/Cb654jehnY5b40b0=; b=R2FTjPzE0GWg+0r7DB6zdCRNWZVB0IrEf1IOQQ1xKt1ls/FHbg4hrjcO0frpe8S3Hc rzQGWXMLwexjtY6EqvxwEx5N0o22O5vjvjwrCt9D2foshPni9D9DU9b6M/7zUq//NqOw du6aqLn8rEZ6qge5U3kjGP5l5vVmckbAWytlEqLDUzwEjugKRHSFhVOav/9hRhxX49eq TGtiEbv2Bu8SKiZJvky+A4hFzIr+46KsVRM1gBfQmLK9aDoeIyKhTE75yFGZo0bUPEoO oWQ+2rsgqhU3Hmr3rVjviAbRZveygRVdQgpzD5NU2SEDA2ENxLQtrr3R9ambs1rNwmxA oqcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yvf81xkqWfodb8THj0KEuhk8sI/Cb654jehnY5b40b0=; b=bzzD3baysqvPs5V1KT+tKo1PRElh1KylgiskvQ7Q0R3xKM1jNMDKS+C974hGww+jg1 wCF7+iYgWS6Hj+qnEWvcme/SgE5/w6b2PsrmRza2b/5/OJADpSr2Fhm0U28MqdQ2EJvH bpZVerAgr73QAuM4vQyJhnJqwDmajGJMhlsSEBh13rj7eXUhQmeidTMT89F5anjHbXd5 YrJogTZUYsFRvqUrhbisoJ4jlMsS6J6DwN60VjCaxbRsMcCZwTIPykXjmXqcz46K9P0b u+XVBlJgw3880c0wgwuGLEE/6yLkAdEvYvhnMYQ7aDVboAz7eETA63Jvfe8rovm0oiIt snZw== X-Gm-Message-State: ANoB5pk4lgIMJTXA7UndhHUEE/ZhTiTDKAgRqgfyIYEA+3IKaBB3Jt24 5H1VgAhWZ6W0+3EeKJAgN7Bn35hDWco= X-Google-Smtp-Source: AA0mqf4Q5HA4MSAcddQXwNOcdpZv7cvAAs+fivMXk6G6o1zfb83rDVFnELIPGgBXwxxxZSCTuFSs8A== X-Received: by 2002:a05:6512:3f29:b0:4b4:af05:4a8d with SMTP id y41-20020a0565123f2900b004b4af054a8dmr14965959lfa.415.1669541855540; Sun, 27 Nov 2022 01:37:35 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id bd3-20020a05651c168300b002770a48fd12sm835615ljb.102.2022.11.27.01.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 01:37:35 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Alex Henrie , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH 5/5] diff-merges: issue warning on lone '-m' option Date: Sun, 27 Nov 2022 12:37:21 +0300 Message-Id: <20221127093721.31012-6-sorganov@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221127093721.31012-1-sorganov@gmail.com> References: <20221127093721.31012-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Lone '-m' is in use by scripts/aliases that aim at enabling diff output for merge commits, but only if '-p' is then specified as well. As '-m' may now be configured to imply '-p', using 'log.diffMerges-m-imply-p', issue warning and suggest to instead use --diff-merges=on,hide that does not depend on user configuration. Signed-off-by: Sergey Organov --- diff-merges.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/diff-merges.c b/diff-merges.c index ddf9a411c49c..b3b3c9e44ba8 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -11,6 +11,7 @@ static diff_merges_setup_func_t force_func = NULL; static int suppress_m_parsing; static int hide = 0; static int m_imply_p = 0; +static int got_m = 0; static void suppress(struct rev_info *revs) { @@ -196,6 +197,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) set_to_default(revs); set_hide(revs); revs->merges_imply_patch = m_imply_p; + got_m = 1; } else if (!strcmp(arg, "-c")) { set_func = set_combined; } else if (!strcmp(arg, "--cc")) { @@ -259,5 +261,7 @@ void diff_merges_setup_revs(struct rev_info *revs) if (revs->merges_imply_patch || revs->merges_need_diff) { if (!revs->diffopt.output_format) revs->diffopt.output_format = DIFF_FORMAT_PATCH; - } + } else if (got_m) + warning(_("legacy use of lone '-m' detected: please use '--diff-merges=on,hide' instead, as '-m' may imply '-p'")); + }