From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 628C11F601 for ; Sat, 17 Dec 2022 13:30:23 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="afpGKdDY"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230344AbiLQNaV (ORCPT ); Sat, 17 Dec 2022 08:30:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230328AbiLQNaO (ORCPT ); Sat, 17 Dec 2022 08:30:14 -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 2412BE0F8 for ; Sat, 17 Dec 2022 05:30:13 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id o6so2631948lfi.5 for ; Sat, 17 Dec 2022 05:30:13 -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=UIYMQ9Nax2Lz3kFOp+oM7WUww5g8ylKVgs4UvB+znX8=; b=afpGKdDY4rklDKaNZRJuHdAVQeskLsfsJGYWWCeTCgVumi9gwDLcTdJnFQaOaKR2nD 4BLHbpFk8SZeCZkKlhGMUxAPA1cB1RI+OU7h75xLhyTlrAquODwsigxgkC+VnaYvbMsk 4t1Uc5FvOTojXIcDjttSGWu+vidan9VacbHwpj1sgosvfwBiy+BsH/Aj45IxasP6GtPP adnh3MWrlKDFGbkINum+HQNmE0SLi82oDiaxoXqX2ZR5u7NWK7DfvWkyUlcD1Hs64uoV UsHycuVcA2F7C+6GpZfSeL9+RCYEwDSVU2mMoNH8nOfrEi3GM6380D8CKhTVoaqeWaqc Bb1w== 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=UIYMQ9Nax2Lz3kFOp+oM7WUww5g8ylKVgs4UvB+znX8=; b=qkpVZbYwH2Hm5a9+ntY0rlXDrnF4alH+eARmt4Fe2DUq5ZU1Hdn/toqmUfKbU8vH0/ 8FRSOKTiWSJuCJWpvNxy5VP+n7aZlemQylHjhjXl4vhdVGLtN/84+nUchGu1JdT+lAWi 83xgiGDcmM9KigBvfJWo3EO942mIfHvaKJFeRVFF3gqU/cCgKm1p4ZBPkHcpG7rl/wgs vNjWGRdKGcB3ewnAFJ5yRHHmeUmvOBfxui9U02iH5B0lScclWk6D5+VhboxbS8rMRrZS RrEEuCTvUIvdlSFOdF5guxSpy4F0ODmFKDl0aQ6xUGUtHdrKhZNvxviX5aToXfcDkq6s HHkQ== X-Gm-Message-State: ANoB5pkhFtlGIlJaYE3gKP2n8UvtaR9DgklAFO2njkVHnUt1RG6ReaW6 hrTAngkDimMxC2L9V6OdroI= X-Google-Smtp-Source: AA0mqf4KLUdNkqzL1131t+ZXYlemACWR01B1Nbdoo5rg9CzQX/TomygbyxiIwV/YcAAhqCMGUnb+Ug== X-Received: by 2002:a05:6512:304b:b0:4b5:892:3987 with SMTP id b11-20020a056512304b00b004b508923987mr20928766lfb.9.1671283811462; Sat, 17 Dec 2022 05:30:11 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id q6-20020a056512210600b004a100c21eaesm512420lfr.97.2022.12.17.05.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 05:30:10 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , Alex Henrie , Jonathan Nieder , huang guanlong , Glen Choo , git@vger.kernel.org, Sergey Organov Subject: [PATCH v1 2/5] diff-merges: implement log.diffMerges-m-imply-p config Date: Sat, 17 Dec 2022 16:29:52 +0300 Message-Id: <20221217132955.108542-3-sorganov@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221217132955.108542-1-sorganov@gmail.com> References: <20221217132955.108542-1-sorganov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 b062bdab04d9..fe15693492a2 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 ' -- 2.25.1