From patchwork Mon May 10 15:34:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12248537 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 30989C433B4 for ; Mon, 10 May 2021 15:35:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09CFB61492 for ; Mon, 10 May 2021 15:35:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237254AbhEJPgT (ORCPT ); Mon, 10 May 2021 11:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235776AbhEJPgC (ORCPT ); Mon, 10 May 2021 11:36:02 -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 DC41AC06175F for ; Mon, 10 May 2021 08:34:56 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id z9so23955804lfu.8 for ; Mon, 10 May 2021 08:34:56 -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=+Tw3EfYkTystDWE6dFgpdsi6tMXjFDv0Loo9hwI4GWw=; b=NjNqTNC8+L3L0IwQJHy5/ieslmiGUkIxrSFBtvIlX+iMMHcJ0mFDzO58buF8TdlfIB 9UuLV7H6nL457qLrrVj/DgjeYx8TwTf/dAbrrg5mN9+blGCoXxXQnbYE55yFR6EG+sMa ii2vs5akHTkarRZz3vyQ65DogxqTWe5q2lZOKnd9fG8ki7ScHfAB0mvX2Jc4nJct4qYF yqh4Hhl2W6XN0iPab95IM1Zr6Vp1xnzLDGvueIIogkRy02JWvzgtqRm1wtqNknd8/vn3 kWETB2tU8JVyR1YrB/U7Fgw/IUZbBd4GsEbMGgOjdCqTsT6cglDbbWfwmdNavaQDJk9S Lz+g== 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=+Tw3EfYkTystDWE6dFgpdsi6tMXjFDv0Loo9hwI4GWw=; b=ih9nciQsw4p5sPII/kuvK2RmdaJUDNoq7Ow3X4zuVdOOxYlYAom6Odd56Fq6/CpGE8 P9kmbFrsbm+sjpgyP7pF+H6dHWrexWErAZ8pBF7uWC8rDDxJHptrgYE4c42IYXG9qodK 5MErFHEjqHZgOUXpSH09IKEYJc3YDkeT5IX78rvtTnRPtwr+kZuraxPyGaYxGBv0l43j j8cnJJHBhoUpIbtPJMZkNVHQHYBuRLd04Nk3H0EPv7nkZgMXmlHjMpY/oGvC1fmrD2K4 uuPP51WNuN0Z4CwgYOvd41QrPbF5BbEGIC6PxD8v3D2Om2i7f3I/n1ihYSrJU7ZGtV6Q 5ABw== X-Gm-Message-State: AOAM531q39HJ4B4t+pxyAf77Txd5rpOdIA0l4MCvDFLk24WABGjNEK6M c82z+lbAlMtICIQIT/xyKpE= X-Google-Smtp-Source: ABdhPJzcqTqTC5YX5ienLYgptZzGC5E7o29e/xP8oTz2zRIoTykJCnCj5GhS9EQu9AjDEWUp2H8dPw== X-Received: by 2002:a19:6901:: with SMTP id e1mr16549016lfc.642.1620660895436; Mon, 10 May 2021 08:34:55 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p8sm1525840lfe.224.2021.05.10.08.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:34:55 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= , Alex Henrie , git@vger.kernel.org, Sergey Organov Subject: [PATCH 1/6] t4013: add test for "git diff-index -m" Date: Mon, 10 May 2021 18:34:46 +0300 Message-Id: <20210510153451.15090-2-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510153451.15090-1-sorganov@gmail.com> References: <20210510153451.15090-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org -m in "git diff-index" means "match missing", that differs from its meaning in "git diff". Let's check it in diff-index. Signed-off-by: Sergey Organov --- t/t4013-diff-various.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 87def81699bf..bd16d4885cfd 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -483,6 +483,19 @@ test_expect_success 'git config log.diffMerges first-parent vs -m' ' 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 +# we provide -m in diff-index. +test_expect_success 'git diff-index -m' ' + rm -f file1 && + git diff-index HEAD >without-m && + lines_count=$(wc -l with-m && + git restore file1 && + test_line_count = $((lines_count - 1)) with-m +' + test_expect_success 'log -S requires an argument' ' test_must_fail git log -S ' From patchwork Mon May 10 15:34:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12248539 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 15161C433ED for ; Mon, 10 May 2021 15:35:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7B0D611BE for ; Mon, 10 May 2021 15:35:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237409AbhEJPg0 (ORCPT ); Mon, 10 May 2021 11:36:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235901AbhEJPgD (ORCPT ); Mon, 10 May 2021 11:36:03 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A93AFC061763 for ; Mon, 10 May 2021 08:34:57 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id w4so21330689ljw.9 for ; Mon, 10 May 2021 08:34:57 -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=medm5K5YgE98JyAJycFftqpZEphBadJa1CFbnqGlNVk=; b=N9m/LbviH1fMASAhStmGCTgz7YSUfQoyS1SF74BmSvOZ7P1tT9MGualUoCvlugTsqp w1MLVMCeNrjiPwLiePkIRhyO72fDg2+RD/72tVjVupo66sIWZWyLubthLyhXegJStQSk iMZVzifi+SETVN8crulRGw/vY12rSKEhWzak30NGGQKhKleSGOs7jfb0s52taqb3MUCl NItqJmXXBUH3VD9fv/u276ifpR9Z9gQWf5kZ6N+3+9iB/LhjiP26li6SP+bVuGjbiosR hJ1erg7/Qdvrm8lrJ7gfu/zU1PNgXFSR8RI0wbAISFIBVaRBZahG3Dm5lKRDcgCkzFHf 7EUA== 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=medm5K5YgE98JyAJycFftqpZEphBadJa1CFbnqGlNVk=; b=nGHo0FGvZr80Zg8PEet/lTsUo9rMfvKpMdzQAnKkMZEujlwhz9Bo0O0AiOFYU51BQz GAKXUwZ4wQ9w5R2yY2P7VyxvD5S+o5jbRrwDczu3r76Curl/e2wJgzZEMYhrejJAQ/ha P5Gea7yTMaXN5i5tB99lvqIzn1wuyVlEHQeLXVYem+mZaHogFmS50vMsuOedXhtwxJUE C605H8kEzmshcUkmQFSiWNV07odlkO5Kxhi+wgS8HZ9cJYU7Sjx/gx0reca0jEOzpQS7 6PIioOYsLBJ8Dt7kFjbi5vemz8m9lP9vf+uzN/FHiAtiw0yWWMISLksqg/UmaPJsRvTD 30Mw== X-Gm-Message-State: AOAM532TFI4teplAY0NUP/GHihM+YrGcRGKmfQ+6SlEMl8rwGSsdPWjt 1M6v1805CAreBQHSACrvLEM= X-Google-Smtp-Source: ABdhPJyvS6Im5WcMkL0WmyUdqMjbu+s0gcfAjz0ajSpVPnNGObwdn5syOxfFYTJMB8TGgrmLGq+Wjg== X-Received: by 2002:a2e:8e21:: with SMTP id r1mr20582559ljk.166.1620660896259; Mon, 10 May 2021 08:34:56 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p8sm1525840lfe.224.2021.05.10.08.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:34:55 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= , Alex Henrie , git@vger.kernel.org, Sergey Organov Subject: [PATCH 2/6] diff-merges: move specific diff-index "-m" handling to diff-index Date: Mon, 10 May 2021 18:34:47 +0300 Message-Id: <20210510153451.15090-3-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510153451.15090-1-sorganov@gmail.com> References: <20210510153451.15090-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Move specific handling of "-m" for diff-index to diff-index.c, so diff-merges is left to handle only diff for merges options. Being a better design by itself, this is especially essential in preparation for letting -m imply -p, as "diff-index -m" obviously should not imply -p, as it's entirely unrelated. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- builtin/diff-index.c | 45 ++++++++++++++++++++++++++++++++++---------- diff-merges.c | 13 +------------ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/builtin/diff-index.c b/builtin/diff-index.c index 176fe7ff2b4e..28bc51d0d8f4 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -12,11 +12,37 @@ static const char diff_cache_usage[] = "[] [...]" COMMON_DIFF_OPTIONS_HELP; +static int parse_distinct_options(int argc, const char **argv, + struct rev_info *revs, unsigned int *options) +{ + int i, left; + + for (i = left = 1; i < argc; i++) { + const char *arg = argv[i]; + int leave = 0; + + if (!strcmp(arg, "--cached")) + *options |= DIFF_INDEX_CACHED; + else if (!strcmp(arg, "--merge-base")) + *options |= DIFF_INDEX_MERGE_BASE; + else if (!strcmp(arg, "-m")) + revs->match_missing = 1; + else + leave = 1; + + if (leave) + argv[left++] = arg; + } + + argv[left] = NULL; + + return left; +} + int cmd_diff_index(int argc, const char **argv, const char *prefix) { struct rev_info rev; unsigned int option = 0; - int i; int result; if (argc == 2 && !strcmp(argv[1], "-h")) @@ -27,17 +53,16 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) rev.abbrev = 0; prefix = precompose_argv_prefix(argc, argv, prefix); + /* + * It's essential to parse our distinct options before calling + * setup_revisions(), for the latter not to see "-m". + */ + argc = parse_distinct_options(argc, argv, &rev, &option); argc = setup_revisions(argc, argv, &rev, NULL); - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; - if (!strcmp(arg, "--cached")) - option |= DIFF_INDEX_CACHED; - else if (!strcmp(arg, "--merge-base")) - option |= DIFF_INDEX_MERGE_BASE; - else - usage(diff_cache_usage); - } + if (argc > 1) + usage(diff_cache_usage); + if (!rev.diffopt.output_format) rev.diffopt.output_format = DIFF_FORMAT_RAW; diff --git a/diff-merges.c b/diff-merges.c index f3a9daed7e05..4016800c422c 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -30,17 +30,6 @@ static void set_first_parent(struct rev_info *revs) revs->first_parent_merges = 1; } -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 default diff for merges". Set - * both fields appropriately. - */ - set_to_default(revs); - revs->match_missing = 1; -} - static void set_combined(struct rev_info *revs) { suppress(revs); @@ -108,7 +97,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) const char *arg = argv[0]; if (!strcmp(arg, "-m")) { - set_m(revs); + set_to_default(revs); } else if (!strcmp(arg, "-c")) { set_combined(revs); revs->combined_imply_patch = 1; From patchwork Mon May 10 15:34:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12248541 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 BEABDC433B4 for ; Mon, 10 May 2021 15:35:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9270A61409 for ; Mon, 10 May 2021 15:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234596AbhEJPgb (ORCPT ); Mon, 10 May 2021 11:36:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236060AbhEJPgD (ORCPT ); Mon, 10 May 2021 11:36:03 -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 7DC6DC061760 for ; Mon, 10 May 2021 08:34:58 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id z9so23955947lfu.8 for ; Mon, 10 May 2021 08:34:58 -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=0OfjDCFK40CHYWc5u5uSaXiZBcYaZsJ1ZH5HBXLLJ+Y=; b=K92j7KjhcQTMKJgUJU3D3G0HfulcnygJHy9WFD//XqnL1ILZTnxreUhWWiELIFYqZH xszGc/IxoKgxXJw/Qlr+tc2atYxKbhMmGeqd0XDlNPQs//zC6WQWlB+EPCyBCuDJ7Yrr HnLU3hwX4yyDpdgTEQcKqt2JYI3pSRi0Yt48/pvYkkU3lwwqCCulHqy9t1eb3E4VqK6H UhslMWv7J1aFvi6omyWnEKe4g5S7Y1uEpcLjDU7IZy7Vgoh7vLvmXf4rJuVjhp0nZwO1 ZEUH2Llisdisarx+UBDp1ejP9y2gGf7VT+eeMKkzAIllE2WxSrk36NW0tel09a2R954T lqIA== 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=0OfjDCFK40CHYWc5u5uSaXiZBcYaZsJ1ZH5HBXLLJ+Y=; b=OCwayl6XFuco87b61VPK/xQ9BfBphWJb4Mkmgy2DAra5apynm+SGWQzqMQnX5hSbV8 VJHBlwadOst4y2i9RZ4WNWETvHRF3RfvTdUAunqwcGKaxGMTg64fdQExW+M+3hKIcflm WQE9rKshjGub7yZL2MbmZJEaz2lh+bVc+i/di0/U6F4d8HMXhYx9fvC4r4eTXzqrxMV6 PD+vn2ttcJg4CHL4EMBODKPFi7xOFojdwzURt6et0AiaB8G9G6xwKdPSIsJDMKARE2ai dKPgXeZZGmzXvDInfRT35S7eoIn6rb+DqvVYQYxZCwyZNRUBSZS4M8N8bPI5Ij3sN3qO 0Imw== X-Gm-Message-State: AOAM533oMXIvybQ8SwHENLQdHwPnh/ExWvuzUV4t/aKl2CZg8I4M11MI ZBL/7z/sjnnYx79f7bFBaNw= X-Google-Smtp-Source: ABdhPJxStqBC0wGLu7mSCu0pj6cEeTOZGa8516OLOwXN/6A7FDekxwo+fW9UBpdcpanVghg5utdm3A== X-Received: by 2002:a05:6512:3f27:: with SMTP id y39mr16766026lfa.166.1620660897088; Mon, 10 May 2021 08:34:57 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p8sm1525840lfe.224.2021.05.10.08.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:34:56 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= , Alex Henrie , git@vger.kernel.org, Sergey Organov Subject: [PATCH 3/6] git-svn: stop passing "-m" to "git rev-list" Date: Mon, 10 May 2021 18:34:48 +0300 Message-Id: <20210510153451.15090-4-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510153451.15090-1-sorganov@gmail.com> References: <20210510153451.15090-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org rev-list doesn't utilize -m. It happens to eat it silently, so this bug went unnoticed. Signed-off-by: Sergey Organov --- perl/Git/SVN.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index f6f1dc03c608..35ff5a68963d 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1636,7 +1636,7 @@ sub has_no_changes { my $commit = shift; my @revs = split / /, command_oneline( - qw(rev-list --parents -1 -m), $commit); + qw(rev-list --parents -1), $commit); # Commits with no parents, e.g. the start of a partial branch, # have changes by definition. From patchwork Mon May 10 15:34:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12248543 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 BB7F3C433ED for ; Mon, 10 May 2021 15:35:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 99B2B61409 for ; Mon, 10 May 2021 15:35:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234298AbhEJPge (ORCPT ); Mon, 10 May 2021 11:36:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236275AbhEJPgG (ORCPT ); Mon, 10 May 2021 11:36:06 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59DC3C06138B for ; Mon, 10 May 2021 08:34:59 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id b7so21346046ljr.4 for ; Mon, 10 May 2021 08:34:59 -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=GAK0Kmgdeu2Z6za0hohy+9fZwSEjprYEppbMV+tguz4=; b=q1bVpt4o4XIM760qj2qIyGBizt2kOfy0/KyR+/gjYWB8X5RpcZXNCr61VRJvI0gdJt A6mekxr05UyPL3KLEXcJu1Jqdw5Mcu4bKDhFm+39wZ+1NDx1SUYNy7cta7w+pebNoH3s ERjUosmRg+Klam/kt47Lj6wEh7PWlGiRgRDu7YQ5+uu3J8RBWjgjHQcO2/t5KwU9i/F1 5CRxSWdOfhi19SXcOeUYUE+foXczcDU2IFXsW+zBSnVqxEPngND3grHGYgvpFGvdKZNe AddK2wzzWF05lXKizcpAUzBUd8d1JkMc5JN1RkLzfvcodwG71/4JC+b0+xdIZdIebxDw wu8w== 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=GAK0Kmgdeu2Z6za0hohy+9fZwSEjprYEppbMV+tguz4=; b=ndMpN0LMoXwOIP1kGEXS1fjKdZZvtDFEaEMdD1XsbXlJ3D6lZEUYpICMR4xY9dyT1E DSOCmPyye0Z+A2/+UX0nk+BlOpevTE00iePYygMmUdvYk/SAFasjLSb7tsT12NMVwu3f /qkXuLYYSbhbJf30Pgsekdj+881NktwVIYObw/eBu2zJpKKKrQuOe7bidoikpByD1POe EASImgQQqz19oA6l5/9mkr27c4bShUrLoq6nd4UmWmY5r6EKvBiHPzdmPlE34mEGbetZ UhDyAgsoSYTkXzUIncG9H7M8/SgqK9KBeHb6heV1DbK+jd7meecNmg36vyYg/p4zCICw gMKQ== X-Gm-Message-State: AOAM530GmGrzFdIj+nRQU4K1B1HVW6BVI0FFn10JgFgVE7MtyydALROI F5ESEf/L5jFjC7choXpitNSDUBnwW9w= X-Google-Smtp-Source: ABdhPJwdqhYPgV4LdW4oJfE0toQbJJAY3XuEt5SgKjZcLXRaiYYdAqsBbnEjg4R2NWaXZiIgc38JGw== X-Received: by 2002:a2e:9346:: with SMTP id m6mr2426717ljh.150.1620660897950; Mon, 10 May 2021 08:34:57 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p8sm1525840lfe.224.2021.05.10.08.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:34:57 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= , Alex Henrie , git@vger.kernel.org, Sergey Organov Subject: [PATCH 4/6] stash list: stop passing "-m" to "git list" Date: Mon, 10 May 2021 18:34:49 +0300 Message-Id: <20210510153451.15090-5-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510153451.15090-1-sorganov@gmail.com> References: <20210510153451.15090-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Passing "-m" in "git list --first-parent -m" is not needed as --first-parent implies --diff-merges=first-parent anyway. OTOH, it will stop being harmless once we let "-m" imply "-p". While we are at it, fix corresponding test description in t3903-stash to match what it actually tests. Signed-off-by: Sergey Organov --- builtin/stash.c | 2 +- t/t3903-stash.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/stash.c b/builtin/stash.c index d68ed784d2af..fe8e97428808 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -761,7 +761,7 @@ static int list_stash(int argc, const char **argv, const char *prefix) cp.git_cmd = 1; strvec_pushl(&cp.args, "log", "--format=%gd: %gs", "-g", - "--first-parent", "-m", NULL); + "--first-parent", NULL); strvec_pushv(&cp.args, argv); strvec_push(&cp.args, ref_stash); strvec_push(&cp.args, "--"); diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 5f282ecf6175..873aa56e359d 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -859,7 +859,7 @@ test_expect_success 'setup stash with index and worktree changes' ' git stash ' -test_expect_success 'stash list implies --first-parent -m' ' +test_expect_success 'stash list -p shows simple diff' ' cat >expect <<-EOF && stash@{0} From patchwork Mon May 10 15:34:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12248545 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 E46E2C433B4 for ; Mon, 10 May 2021 15:35:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADD1061108 for ; Mon, 10 May 2021 15:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232253AbhEJPgv (ORCPT ); Mon, 10 May 2021 11:36:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236124AbhEJPgG (ORCPT ); Mon, 10 May 2021 11:36:06 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 894ADC061761 for ; Mon, 10 May 2021 08:35:00 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id v6so21341686ljj.5 for ; Mon, 10 May 2021 08:35:00 -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=GCpV8oz7FCNaOUZBMyoTu3fLUwAHtr+vf+qs5Rm63RY=; b=u1Tae1QSIXKi/tcFGWgKxyveOUJdmXeAfuvTkAHJQ78/5OLxMs5MB1tQztstuBjfWl PgglvGybs4gUbEt7AxiiGduRrTreuW5Ha+/AzAhKu7CmxRr4m1RhAXWZ+c5LXFYAc/BY uyMcy9hJVdBpYZXyStpEdTVeURTBQEWK9q4mfnUzdAvbvB8/4vF74brnjh2AtIZD8joT rtjJ2oS7FH/MAQpzxKT68tf+IETnN8hFNOTIKtbtixF40PVfhUV/y4X2bxuyFLAwhDtZ LFqhGOsasJkv/I/4kDwci302egXP/sxoG4T4nbTQkvtaGicYrs/GNuMbGypESE2kPAcP ubBw== 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=GCpV8oz7FCNaOUZBMyoTu3fLUwAHtr+vf+qs5Rm63RY=; b=F0rU3h9hemOKGu5ltyuDq0vZxKZjkE3jdJfd/GAt9MWMRKEVz3lV4ZSJhpAvMdM9xQ jC6XxdVrmSDEdcdjN8wZ9DOiuelRVRJ/7puQVU1GECRuX9mVTVpmshM0kQErjK9kLnvY ke5Nsq389x0I9olQmxtHU8f9ufyomLOC2o7XAZz4UPlandAy1Qkk/tRWkMRC558bDiEm EKAKVudd1C3GYPf63mkqs85tmv3TG80DTSca4zGjZFFRuuidLsJ6EfNSObgCCbN5cJqw jiUl1QsQcD1ZBhUojmLtWU2eyW4BztjFc4U6d739yNPq/nCV/NK1IxfeRtD9xmfisH5u xn6w== X-Gm-Message-State: AOAM5336cdbzQoRcUexLjzljZXVkXa5ao7TFt9OHcRGVYLBJwvOF2FuS j8BkJFQysGq5iKOTpfvuMHM= X-Google-Smtp-Source: ABdhPJwi9g487CwdKc8RkxOGPk5Ev9ScnUJSQAcp44gYEpMITOzG1JGFCEFqVQsH2qLKWWjVywwhYA== X-Received: by 2002:a2e:1f12:: with SMTP id f18mr3057612ljf.75.1620660898777; Mon, 10 May 2021 08:34:58 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p8sm1525840lfe.224.2021.05.10.08.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:34:58 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= , Alex Henrie , git@vger.kernel.org, Sergey Organov Subject: [PATCH 5/6] diff-merges: rename "combined_imply_patch" to "merges_imply_patch" Date: Mon, 10 May 2021 18:34:50 +0300 Message-Id: <20210510153451.15090-6-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510153451.15090-1-sorganov@gmail.com> References: <20210510153451.15090-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is refactoring change in preparation for the next commit that will let -m imply -p. The old name doesn't match the intention to let not only -c/-cc imply -p, but also -m, that is not a "combined" format, so we rename the flag accordingly. Signed-off-by: Sergey Organov --- diff-merges.c | 10 +++++----- revision.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/diff-merges.c b/diff-merges.c index 4016800c422c..211c99482cac 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -14,7 +14,7 @@ static void suppress(struct rev_info *revs) revs->combine_merges = 0; revs->dense_combined_merges = 0; revs->combined_all_paths = 0; - revs->combined_imply_patch = 0; + revs->merges_imply_patch = 0; revs->merges_need_diff = 0; } @@ -100,10 +100,10 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) set_to_default(revs); } else if (!strcmp(arg, "-c")) { set_combined(revs); - revs->combined_imply_patch = 1; + revs->merges_imply_patch = 1; } else if (!strcmp(arg, "--cc")) { set_dense_combined(revs); - revs->combined_imply_patch = 1; + revs->merges_imply_patch = 1; } else if (!strcmp(arg, "--no-diff-merges")) { suppress(revs); } else if (!strcmp(arg, "--combined-all-paths")) { @@ -150,9 +150,9 @@ void diff_merges_setup_revs(struct rev_info *revs) revs->first_parent_merges = 0; if (revs->combined_all_paths && !revs->combine_merges) die("--combined-all-paths makes no sense without -c or --cc"); - if (revs->combined_imply_patch) + if (revs->merges_imply_patch) revs->diff = 1; - if (revs->combined_imply_patch || revs->merges_need_diff) { + if (revs->merges_imply_patch || revs->merges_need_diff) { if (!revs->diffopt.output_format) revs->diffopt.output_format = DIFF_FORMAT_PATCH; } diff --git a/revision.h b/revision.h index 93aa012f518e..17698cb51aca 100644 --- a/revision.h +++ b/revision.h @@ -193,10 +193,10 @@ struct rev_info { /* Diff-merge flags */ explicit_diff_merges: 1, merges_need_diff: 1, + merges_imply_patch:1, separate_merges: 1, combine_merges:1, combined_all_paths:1, - combined_imply_patch:1, dense_combined_merges:1, first_parent_merges:1; From patchwork Mon May 10 15:34:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12248547 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 42AF8C433B4 for ; Mon, 10 May 2021 15:36:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 011CE60FE4 for ; Mon, 10 May 2021 15:36:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236124AbhEJPhS (ORCPT ); Mon, 10 May 2021 11:37:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236915AbhEJPgQ (ORCPT ); Mon, 10 May 2021 11:36:16 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AE18C06138C for ; Mon, 10 May 2021 08:35:01 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id y9so21343977ljn.6 for ; Mon, 10 May 2021 08:35:00 -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=6KhzJs/dinjnLOcbhzCxccbsE7+tAIYsSiwjLFYEEfQ=; b=mHzpZU8SKVypim3+fsAPrSw6jsc0DuumLc+d3jVvZGaC3oJdun5ysK6EFKyt0JPBSv Y/VslabjvJtRlIwFFLpHMHaz6CYHHSkMu2Euio6PpGz1KeAjpcUdg0rrPD6NKqu7E4Mw +Bb7/Wm7QuvqJTKqwLFW6SfKl7iq+Ia31ZUn2+xROMcy6AWHYAcmzwqzXAm+IYlyYN4Z NJ7XSK0TAwoUiijWuUvqgw5UKeXrkUmWY81ChWd+EtYM48okn3TVISee2cOXireDTxBg GupyyDOMt9sai1eeTfimbaWVeAFyNp1P+2NvYwEy7ZH+xGAok81XANXYgy3Zxw/2MUeP eztA== 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=6KhzJs/dinjnLOcbhzCxccbsE7+tAIYsSiwjLFYEEfQ=; b=qsyIxh5dDSK40UnYNm/sVxvbe2pJZx6Shfr3Q8JCgdP0rhFn22v4WgAbpQIRCzpeSq eXTn8ojsig7kXt8qX6+lEfeGJIIaL/h0B1OeXk/iMY5+1ZV7pJQc2ZT+aFO6nuT9qLD/ sSYrJY77LjR21B3D+d1aRj5zT1BL6huBA5BqCMJSctB0x8r7O6fqAtkG5bk4OicYrD9S +CK2sXIiH15xRdlTQthcmIuYcYCHwi38xRWoXnm3qShZaLb2MoY8J7k70ZseOkZ+L5Od 7MmVud0IAXVtU9ket3/pWZQ5I/Y6nyZ97pGZfoC45drMZAzSpS2T2xivTNgZvn79fCey Ze3A== X-Gm-Message-State: AOAM531wgUrx2Wkj4GT1obEbW4vFmBJquM0Q3O7rBzBo5xu7lDv5ztvI 0Q1J9GKmfbUHLFq7xCWUFIA= X-Google-Smtp-Source: ABdhPJyObqb/FnDdbURC1pexFG/2F+dG1Em3TQLxJqRpFOEA+/cplchkfTrDzVAhxJUBC6HEwxL4Ug== X-Received: by 2002:a2e:330e:: with SMTP id d14mr20537737ljc.412.1620660899603; Mon, 10 May 2021 08:34:59 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p8sm1525840lfe.224.2021.05.10.08.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:34:59 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= , Alex Henrie , git@vger.kernel.org, Sergey Organov Subject: [PATCH 6/6] diff-merges: let -m imply -p Date: Mon, 10 May 2021 18:34:51 +0300 Message-Id: <20210510153451.15090-7-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510153451.15090-1-sorganov@gmail.com> References: <20210510153451.15090-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Fix long standing inconsistency between -c/--cc that do imply -p, on one side, and -m that did not imply -p, on the other side. After this patch git log -m will start to produce diffs without need to provide -p as well, that improves both consistency and usability. It gets even more useful if one sets "log.diffMerges" configuration variable to "first-parent" to force -m produce usual diff with respect to first parent only. Previous semantics of -m could still be accessed using --diff-merges=separate option. Change documentation accordingly. Signed-off-by: Sergey Organov --- Documentation/diff-options.txt | 8 ++++---- diff-merges.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 530d1159141f..32e6dee5ac3b 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -49,10 +49,9 @@ 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`. + is `separate`. `-m` implies `-p`. + --diff-merges=first-parent::: --diff-merges=1::: @@ -62,7 +61,8 @@ ifdef::git-log[] --diff-merges=separate::: 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. + for each parent. This is the format that `-m` produced + historically. + --diff-merges=combined::: --diff-merges=c::: diff --git a/diff-merges.c b/diff-merges.c index 211c99482cac..a827482a97ff 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -98,6 +98,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) if (!strcmp(arg, "-m")) { set_to_default(revs); + revs->merges_imply_patch = 1; } else if (!strcmp(arg, "-c")) { set_combined(revs); revs->merges_imply_patch = 1;