From patchwork Thu May 20 21:46:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12271407 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 CAACCC43461 for ; Thu, 20 May 2021 21:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADF456135B for ; Thu, 20 May 2021 21:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230445AbhETVsn (ORCPT ); Thu, 20 May 2021 17:48:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230430AbhETVsl (ORCPT ); Thu, 20 May 2021 17:48:41 -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 077D8C061763 for ; Thu, 20 May 2021 14:47:18 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id r5so26618507lfr.5 for ; Thu, 20 May 2021 14:47:18 -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=EWzMs0tJfbY+VxvskRfJ3SIb+kYcTuW3zF2PoyGOtmc=; b=gtxgDWCzCvv48iPbO+uWtt5dqYTwuBPMA4k1sI5QHVxGWdIL8XjD/UG3jEfuBXVseS shFkLPxZkBk+p5YgIyb709mI4zVkqnamKy19eYBqh96s7ulJ6cEBEI8h+F7qkKZ68q4U BoNpuvONApL0/6IAhex+DmL2t3RSbENy7BjcmM6QbiTETWtvzezKF+mFLAJBSd7et8Jg Ty/e7E8cTiY21PSU7DU8by1bnO51DoWwbkK1p9oR+/vUBUQv1mQPapX874OoYwN0CT48 S+G5nlAEChs2WwIUhbteSP3q64peP8QOm7ncl3V3pVNZ2HqVlUsf77Y9mLvJwfv5RcjU WVUg== 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=EWzMs0tJfbY+VxvskRfJ3SIb+kYcTuW3zF2PoyGOtmc=; b=FzvpSxk+3ke5ltNdoNDtnwlIw7BbYAP6Ic8mQKFV0e4ypMwXJZbcYnv/C2fprycw4N aPJnT6XJl7ez0+tl8nXzdy35Ufsrf8M/rAG6KNZciWDfzZfZplUL+ScSdA/Sux8qkbVJ VoTCeVTb3fBx1xCKlvwwdbMivJSsEktvFZA2hz7ToPYw3KUjXlnOmITRXfb8OnD7Z6i6 0VhQ3Fu+sZrLrdXY0EmBaBggOh4thbp36PSzHcACNpiXZ5UrxpW9ol1tfHUifRIidWBS L4yX3XwEuk7IPyddnL6nXmHdbSb3rG2EqcBVqJ0WLbp71Vj6eW16xqE1hShhYIhPQt7M 5KDQ== X-Gm-Message-State: AOAM531XoFwPRdlL2IUqHRyMhEcrSswyLHpgq+sFReCFQ/dpK7MHk+E4 PKYR962bbrHTsFkiPSMk1ts= X-Google-Smtp-Source: ABdhPJxDt7UpZYku/rpyiZSEVFdOycHGhPZjjfyOsSQzEYLcRiyD72PvKCpW2QkI4tx6N/HhD3Cr3Q== X-Received: by 2002:ac2:5f97:: with SMTP id r23mr4448276lfe.337.1621547237406; Thu, 20 May 2021 14:47:17 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:17 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 01/10] t4013: test that "-m" alone has no effect in "git log" Date: Fri, 21 May 2021 00:46:54 +0300 Message-Id: <20210520214703.27323-2-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is to notice current behavior that we are going to change when we start to imply "-p" by "-m". 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 87def81699bf..e9f67cd24351 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 -m matches pure log' ' + git log master >result && + process_diffs result >expected && + git log -m >result && + process_diffs result >actual && + test_cmp expected actual +' + test_expect_success 'log --diff-merges=on matches --diff-merges=separate' ' git log -p --diff-merges=separate master >result && process_diffs result >expected && From patchwork Thu May 20 21:46:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12271405 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 33727C433ED for ; Thu, 20 May 2021 21:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13CE060FEE for ; Thu, 20 May 2021 21:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230444AbhETVsn (ORCPT ); Thu, 20 May 2021 17:48:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230433AbhETVsm (ORCPT ); Thu, 20 May 2021 17:48:42 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2480C061574 for ; Thu, 20 May 2021 14:47:19 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id q7so25298437lfr.6 for ; Thu, 20 May 2021 14:47:19 -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=nhQE+4C3s4dZyEuryZBTEMAFU+w/YgzcSN8Qkvty+LQ=; b=sMcR2NdELSpXUqduQBnS99H/ajuRU5TqQirD7zCeznIYl/oUCTTtxizgimDauX15LD //Mhj5yM1q4uY+Q8vkkgyJdzDlhwLdT+O9hQvjnl39CEHD9Pep3SzuVsdeZsKUYiDOlD 58LdBie4RuLJUAFDNrlmpqoS2JVKV0WyAxOM1DmiTW5uDYvTylxNHWdgh6Q2gmThSYeI /IrUOIBmJ5iWqqJWqkZFuuOyYq2rFIuu+iw+t8GS5n7e11ROL9BhTq7giZfEiChmZNmG fPi+L9ILz7W196bY6VppHapGZ05D0L7UUmb6xgGxOQUiCYqNaQ5U/aL0CAWLMYBZL0fI SBgQ== 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=nhQE+4C3s4dZyEuryZBTEMAFU+w/YgzcSN8Qkvty+LQ=; b=PqjoVUH42y3ipKWbE8jplag0qkSME6CR8VB+IuhCKebRFRUI8tZ49MAbr1EZ5IMHhf jK0fOg1/Chd5M7qic8j86Z/GNGF4eowuribeh9UBo/VvLthGLTYqkWeTObGa7v32BRBk u92+bZSTKVHDDcmPLv7dRTg1Jc7GOL9srvVeRP/HDs2haWUX/8mYZ4gXq7joZwl824Cb MldEnZ2sMBD+FGQZf8viJ37HMnjqSUpcATVRTzAnDlnAQz3mFQRYt/3eGPYv4gGuK++b wZt7Vv4YGrX8yFoVNh4Db7t3rQbfWogIyxT+CR/K5dTj1AnoqaDHAnG0rngkHxlta0V2 +fiQ== X-Gm-Message-State: AOAM530MxkYMmGMv77qmHI1a3z3rEm14zl2W2+iuc0sm7pCQIddLBp4q Q9OTgkTNSqE/j1XLZ+9E1to= X-Google-Smtp-Source: ABdhPJzwzCNxeZs0Tx54nfY1M/iw93AgkLZpx8deAJTZJVOtsBF7M9qAKwWwxzSJb3Ht8kSZUvy3sw== X-Received: by 2002:a05:6512:b26:: with SMTP id w38mr4646816lfu.152.1621547238320; Thu, 20 May 2021 14:47:18 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:17 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 02/10] t4013: test "git log -m --raw" Date: Fri, 21 May 2021 00:46:55 +0300 Message-Id: <20210520214703.27323-3-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is to ensure we won't break different diff formats when we start to imply "-p" by "-m". Signed-off-by: Sergey Organov --- t/t4013-diff-various.sh | 1 + t/t4013/diff.log_-m_--raw_master | 61 ++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 t/t4013/diff.log_-m_--raw_master diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index e9f67cd24351..1809355f9bb1 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -337,6 +337,7 @@ log -m -p --first-parent master log -m -p master log --cc -m -p master log -c -m -p master +log -m --raw master log -SF master log -S F master log -SF -p master diff --git a/t/t4013/diff.log_-m_--raw_master b/t/t4013/diff.log_-m_--raw_master new file mode 100644 index 000000000000..cd2ecc462832 --- /dev/null +++ b/t/t4013/diff.log_-m_--raw_master @@ -0,0 +1,61 @@ +$ git log -m --raw master +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) +Merge: 9a6d494 c7a2ab9 +Author: A U Thor +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + +:100644 100644 cead32e... 992913c... M dir/sub +:100644 100644 b414108... 10a8a9f... M file0 + +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) +Merge: 9a6d494 c7a2ab9 +Author: A U Thor +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + +:100644 100644 7289e35... 992913c... M dir/sub +:100644 100644 f4615da... 10a8a9f... M file0 +:000000 100644 0000000... b1e6722... A file1 +:100644 000000 01e79c3... 0000000... D file2 +:100644 000000 7289e35... 0000000... D file3 + +commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a +Author: A U Thor +Date: Mon Jun 26 00:03:00 2006 +0000 + + Side + +:100644 100644 35d242b... 7289e35... M dir/sub +:100644 100644 01e79c3... f4615da... M file0 +:000000 100644 0000000... 7289e35... A file3 + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + +:100644 100644 8422d40... cead32e... M dir/sub +:000000 100644 0000000... b1e6722... A file1 + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + +:100644 100644 35d242b... 8422d40... M dir/sub +:100644 100644 01e79c3... b414108... M file0 +:100644 000000 01e79c3... 0000000... D file2 + +commit 444ac553ac7612cc88969031b02b3767fb8a353a +Author: A U Thor +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ From patchwork Thu May 20 21:46:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12271409 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 82C6CC43462 for ; Thu, 20 May 2021 21:47:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A2126135C for ; Thu, 20 May 2021 21:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230453AbhETVso (ORCPT ); Thu, 20 May 2021 17:48:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230430AbhETVso (ORCPT ); Thu, 20 May 2021 17:48:44 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF9CC061574 for ; Thu, 20 May 2021 14:47:20 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id v8so21657475lft.8 for ; Thu, 20 May 2021 14:47:20 -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=HvGN4I9Mq2UfuOMTLnmwVYNfl7ipfkTomAHZoFPm8cE=; b=G//gmsNsrtjKqpYbqBlqtodEx5/b2HHPvmMpSdkKTsHbFAPKHienkG6i1wFViN2b8O EIqMHyiP0su2/KQlViOcT7AsLpUcB3C5FnOhUVHY2CHUKOHnIKS9RgUykVC+h9+bfsP+ smVbB625xV2H95Y7kL9Y0Kvr956hoIRYCOOkLziVPGluZHChZ33isVJ6G9vygRYZblhR GKidq9eg4wORUoK648FUi0w1VW9nrcWPlZR0VFvBB3/qUSWuU1EtcD8Wn4HZojF9ActR nLW61TQy17I0RkX8t5MmSEiY8Nz4kv29y6eR3tTWg0fgqAGeoZy/pICyICMmdCUOUKbH 7jvg== 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=HvGN4I9Mq2UfuOMTLnmwVYNfl7ipfkTomAHZoFPm8cE=; b=PEp94C6bmXgvfqO9bLemDZ+NyPK9uJbF0CooBdLRC6Ms7eynZkPxz0i0FBKdfdEYnw nl3G+5vQ7mG+m/ufKbh90z7ue7wyPmwGXOI1Q4Z2JwXYUs+O8IJ55lsnA3tsMF0KZZ0P Yhsi8RWKefCypwSixzqerp9s+Xjgv1rni2YZ1W+OWEat8yjJyeTr3aODl2h2m2dbHKZ3 fHO9HedLGwVMxhk/w0r9ygZ1o71ztYCEJZHcMJXf65qt8/g/Ki5N+EhSB3e7z4f3akKk MIZN0d2iUvcnw6HYc6261mzi+VhZO+/RePwL2mHZsUuswhloHYe3XPWv+FJCK45oQwDn FDxQ== X-Gm-Message-State: AOAM53271+2CIAMBS+r55O9SKkuYt6NacToQ4IKjm5v4yJPH3H9kw/U4 /RrmrxCFk5pBs7kxiAUIyTM= X-Google-Smtp-Source: ABdhPJyioldWQcQZiDgJMw1oUJ1458jDQ849rPA1RR/uoJU+KFVwGEAHTeFhxTf7ADHYk4IpzPMQTQ== X-Received: by 2002:ac2:5977:: with SMTP id h23mr4371053lfp.596.1621547239247; Thu, 20 May 2021 14:47:19 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:18 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 03/10] t4013: test "git log -m --stat" Date: Fri, 21 May 2021 00:46:56 +0300 Message-Id: <20210520214703.27323-4-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is to ensure we won't break different diff formats when we start to imply "-p" by "-m". Signed-off-by: Sergey Organov --- t/t4013-diff-various.sh | 1 + t/t4013/diff.log_-m_--stat_master | 66 +++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 t/t4013/diff.log_-m_--stat_master diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 1809355f9bb1..e53ca7aa503f 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -338,6 +338,7 @@ log -m -p master log --cc -m -p master log -c -m -p master log -m --raw master +log -m --stat master log -SF master log -S F master log -SF -p master diff --git a/t/t4013/diff.log_-m_--stat_master b/t/t4013/diff.log_-m_--stat_master new file mode 100644 index 000000000000..c7db084fd905 --- /dev/null +++ b/t/t4013/diff.log_-m_--stat_master @@ -0,0 +1,66 @@ +$ git log -m --stat master +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) +Merge: 9a6d494 c7a2ab9 +Author: A U Thor +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + + dir/sub | 2 ++ + file0 | 3 +++ + 2 files changed, 5 insertions(+) + +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) +Merge: 9a6d494 c7a2ab9 +Author: A U Thor +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + + dir/sub | 4 ++++ + file0 | 3 +++ + file1 | 3 +++ + file2 | 3 --- + file3 | 4 ---- + 5 files changed, 10 insertions(+), 7 deletions(-) + +commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a +Author: A U Thor +Date: Mon Jun 26 00:03:00 2006 +0000 + + Side + + dir/sub | 2 ++ + file0 | 3 +++ + file3 | 4 ++++ + 3 files changed, 9 insertions(+) + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + + dir/sub | 2 ++ + file1 | 3 +++ + 2 files changed, 5 insertions(+) + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + + dir/sub | 2 ++ + file0 | 3 +++ + file2 | 3 --- + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit 444ac553ac7612cc88969031b02b3767fb8a353a +Author: A U Thor +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ From patchwork Thu May 20 21:46:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12271411 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 87C75C433ED for ; Thu, 20 May 2021 21:47:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BD4A6135C for ; Thu, 20 May 2021 21:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230459AbhETVsp (ORCPT ); Thu, 20 May 2021 17:48:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230446AbhETVso (ORCPT ); Thu, 20 May 2021 17:48:44 -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 AF33BC061761 for ; Thu, 20 May 2021 14:47:21 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id p20so21611692ljj.8 for ; Thu, 20 May 2021 14:47:21 -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=uNY/uuZEuclC+DcxmOGE52HcpMuUheiuLiV0d50brtE=; b=aBCiCq90IiqX5OtzY9cpbPd0GfG5WmYv+EuOo2i1sNMQoH19Tvgi9sEkqM847RlH4h bdINA1ZlSIVzFq+b2pkEFGjOBlJYxqT28jFE/OyYm/7S+zM6itTx28IbzgYN/ekafd3E L30JG6nzMFLlxf8n23ATie8D//F3XR/do8pZ8kegKiRrXVTfwFxijhFDNhVARFUp8oER yD1qU/QeXi0jRtC5vvBnL6otukQo+lQg7pLZ5x3M+2/yDRU1VqnK4G9GsTi6MijWNN0D S1LePtObjyFiHiahT2fw2aNDM0GNBYMiQCPpi7ifMXGk3aJXsF6jPnjhd9t4ZWnG6/94 QKSA== 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=uNY/uuZEuclC+DcxmOGE52HcpMuUheiuLiV0d50brtE=; b=KX/upPnz0kyQgen2Lanyj0/Q5z3BhtEqGBUfs0HY7osVoSeX++t8wsacCSDBfwK9G6 ep/x8t07D70hitnkM+021lYMC8HkBEodpIjwJ1l0AGxzdpzpKfs58mMDin27DE4E8rs+ cUYqyivra/uvKPeXL4HxZhvkTL90hWfbHS4w/m4ivlbtbo1/aHnPXLKv5f42bXIgRWrZ vicUXdrzFFrKUv7UbwmIg4+oALV87kcpMLXu6d3fxNzMVmQALgyYMHVgKpfEjM3uJesB +f3U3Y03l4QngM1GFEBqw2B4R9wPT3ZGBMv9LP3aQDDgTgSXP2vAuY71m3hqf/hbXVAn Wo4g== X-Gm-Message-State: AOAM530/HQjgBNRaVGA/xtVH1/IuPJLwQmKDkdHx8AFgshEl3YOYwgDA EKcJBQJrksn06hot3PZi24I= X-Google-Smtp-Source: ABdhPJycNs/Ks+KIbOJq5snpkk5JOLPpRVoJXrWMOV2bOCBFwGoA50sPBS/pJxV38F0lYcWXE2zGGQ== X-Received: by 2002:a05:651c:1063:: with SMTP id y3mr4367637ljm.183.1621547240126; Thu, 20 May 2021 14:47:20 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:19 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 04/10] t4013: test "git diff-tree -m" Date: Fri, 21 May 2021 00:46:57 +0300 Message-Id: <20210520214703.27323-5-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We want to ensure we don't affect plumbing commands with our changes of "-m" semantics, so add corresponding test. Signed-off-by: Sergey Organov --- t/t4013-diff-various.sh | 1 + t/t4013/diff.diff-tree_-m_master | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 t/t4013/diff.diff-tree_-m_master diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index e53ca7aa503f..bdc23b1180b0 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -293,6 +293,7 @@ diff-tree --stat initial mode diff-tree --summary initial mode diff-tree master +diff-tree -m master diff-tree -p master diff-tree -p -m master diff-tree -c master diff --git a/t/t4013/diff.diff-tree_-m_master b/t/t4013/diff.diff-tree_-m_master new file mode 100644 index 000000000000..6d0a2207fb30 --- /dev/null +++ b/t/t4013/diff.diff-tree_-m_master @@ -0,0 +1,11 @@ +$ git diff-tree -m master +59d314ad6f356dd08601a4cd5e530381da3e3c64 +:040000 040000 65f5c9dd60ce3b2b3324b618ac7accf8d912c113 0564e026437809817a64fff393079714b6dd4628 M dir +:100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M file0 +59d314ad6f356dd08601a4cd5e530381da3e3c64 +:040000 040000 f977ed46ae6873c1c30ab878e15a4accedc3618b 0564e026437809817a64fff393079714b6dd4628 M dir +:100644 100644 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M file0 +:000000 100644 0000000000000000000000000000000000000000 b1e67221afe8461efd244b487afca22d46b95eb8 A file1 +:100644 000000 01e79c32a8c99c557f0757da7cb6d65b3414466d 0000000000000000000000000000000000000000 D file2 +:100644 000000 7289e35bff32727c08dda207511bec138fdb9ea5 0000000000000000000000000000000000000000 D file3 +$ From patchwork Thu May 20 21:46:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12271413 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 260D6C433B4 for ; Thu, 20 May 2021 21:47:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 057EB60FEE for ; Thu, 20 May 2021 21:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230460AbhETVsq (ORCPT ); Thu, 20 May 2021 17:48:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230455AbhETVso (ORCPT ); Thu, 20 May 2021 17:48:44 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB207C061574 for ; Thu, 20 May 2021 14:47:22 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id b12so14389044ljp.1 for ; Thu, 20 May 2021 14:47:22 -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=FJ1w7idvQFx2geKfGCvkNfGNY/IV3ti4dyZkMsKjReY=; b=Suw/O5GAYqQcHVkhwF0VYadVrZs41l22oKcTTATJFo6tl9mNPE0VFka8dT1LmZlK6E SSmwXRDUfde/b9OxImWAxUyi3Y/1Sw2+OTo4tcS3gqxdsBB1SSEXlDrYMICqIuPaPKhw vVlckPv+5hBjdt9gd/7UlnWnn/dSbg82msAgjVoilVLC+WGIcZSgfM+MB/IrgvboxGF7 kUGS5JTjVZaQKEkRW2MDSo1pIAfDAEYYKxXHS7yl9Bd6G2PISa9zsmDuOZKiVvE3BWM5 zVA9p6/yjf+iNtaDMbn/FVt9zptjxC3fDhk/kfAZer/19OPKode09Z4BiGzkzVbpmtPf L7cA== 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=FJ1w7idvQFx2geKfGCvkNfGNY/IV3ti4dyZkMsKjReY=; b=traMw/i5TzjXZMDdwy9tJA7v1td4ZGjPMGVPd5N5Pbe0k4uOQvVhhSEf42Y0czLZm0 iXckuYMK5ylI7zCQZpNOhevVb6Q2ZsGmucTeXxlwl1DkvFbVBU2x2GEmx2xg5z+rxT/p 7bDGqMlWMxbPsT35HOe7I6aYF4TzCJwvs2j0wJN1HsAZwnyf/erb58YWf8s/Q/Nd45dv +l9Z7+6j3x8aIRbju8CpbU2yQIctqy6n5gagXzq9SCqONkMq+wpUyqTbzXW3JCiG+Deh r5uHrrhRI73eeDDZbeEe0NunaZOG9SDXMte95qsYH5shUEg4G3ZbUMVTkcNffX1o1Hiv IM7g== X-Gm-Message-State: AOAM533tRhKisYqR/hTdZVA2bDdrtwevR0RyVHWJ1U2xFVHaEQak6n/E asa7v1Pz3tDx5saCvNfmC/KhhCe1L3U= X-Google-Smtp-Source: ABdhPJwKHHr+pFXYWc0PQiIteSZXidu3rFhFcq7/CQsvTpN15umUTYAvj+8F+s/uSBEeF8KZZHIMsA== X-Received: by 2002:a05:651c:1408:: with SMTP id u8mr4388829lje.401.1621547241149; Thu, 20 May 2021 14:47:21 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:20 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 05/10] t4013: test "git diff-index -m" Date: Fri, 21 May 2021 00:46:58 +0300 Message-Id: <20210520214703.27323-6-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-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 bdc23b1180b0..e561a8e48521 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -494,6 +494,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 Thu May 20 21:46:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12271415 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 222E9C43461 for ; Thu, 20 May 2021 21:47:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 035FC60FEE for ; Thu, 20 May 2021 21:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230472AbhETVsr (ORCPT ); Thu, 20 May 2021 17:48:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230461AbhETVsp (ORCPT ); Thu, 20 May 2021 17:48:45 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADA21C061761 for ; Thu, 20 May 2021 14:47:23 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id c10so5637996lfm.0 for ; Thu, 20 May 2021 14:47: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=q5WLGyQxJ+bSbUwGFcCKinvSLjoeHjsRBqjWo58Znlc=; b=CJIHi3hhRg0fqBDhx7hbkO0jvgDfyxvcg0X+7Xp0bTT0nNl7+mODToJEh0IN3G4V85 /6gHXOOokYVjnzBHh0963m/5W2YFCEDNHePfyAU2Jb3xsiyDjlwvgklnsb4mNBE3yO29 C5ORb1tu+MUYL1l6BfGJnYfULosdEYvVFpKB1xfLc6agyep3CXcSa5ryX1le6wPf2oLy afI1NdvAtpwM4/awpAs2S7+O9c1LCsJyejrsWpkzprSuhhgJGDNac1SWbnsEHuI0xOCj uQMSll9UOsvUO+nYT+1vyOAlTRx4gil2VtFKTiQCwSgJ16oRJF+yn5JpFBxG7xbmE/HF yKvQ== 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=q5WLGyQxJ+bSbUwGFcCKinvSLjoeHjsRBqjWo58Znlc=; b=VZRN+3VBwG2Q6xGy8OUgtPMQ4ivxpZJwLYzmKWDfYkrn6lnT+TKhysbWwm84Pi5qFc bch1pYUrEj7FMdc2ErGpfw6tcZ3G8Dm7eRGxVz5grVM4L8gbx4pyu3Adn9BoN6JiCuwi yZIeFuIN3DoawbUECAx2lQPWckSGt43KnO6q/mR4ZYSqKbw5Kv9YO8tfa+a/wnsvSji7 YgS134giW+AbeW4NJe8A3b3LFvw//WLZ6mRCXWDvB2MVr+S2g3Dc2uuezbRqab1LOFps j4m8U8DQUdZfMK3/wuH8oA8jjqBwaHJIh5vLSD7sgRCGAshr36YJIOL3JpdOacHocKBt yTUw== X-Gm-Message-State: AOAM533q7tj03AfmpUUxWbkiKO5H4JP+JfmYknCRJUcg2NcqUgUfG7BE n1ZrheL8GunXRKmQd7J0Kx0= X-Google-Smtp-Source: ABdhPJwcNcYwLanAijy8BaDh3ML8oerXdKcBYS+TnlWXF+1Jbm9wEsgse8vq0lE+IDLKh+Ul0s7IXw== X-Received: by 2002:a05:6512:1295:: with SMTP id u21mr4622107lfs.584.1621547242107; Thu, 20 May 2021 14:47:22 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:21 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 06/10] diff-merges: move specific diff-index "-m" handling to diff-index Date: Fri, 21 May 2021 00:46:59 +0300 Message-Id: <20210520214703.27323-7-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-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. To handle this, in addition to moving specific diff-index "-m" code out of diff-merges, we introduce new diff_merges_suppress_options_parsing() and call it before generic options processing in cmd_diff_index(). This new diff_merges_suppress_options_parsing() could then be reused and called before invocations of setup_revisions() for other commands that don't need --diff-merges options, but that's outside of the scope of these patch series. Signed-off-by: Sergey Organov --- builtin/diff-index.c | 9 +++++++++ diff-merges.c | 25 +++++++++++++------------ diff-merges.h | 2 ++ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/builtin/diff-index.c b/builtin/diff-index.c index 176fe7ff2b4e..cf09559e422d 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -2,6 +2,7 @@ #include "cache.h" #include "config.h" #include "diff.h" +#include "diff-merges.h" #include "commit.h" #include "revision.h" #include "builtin.h" @@ -27,6 +28,12 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) rev.abbrev = 0; prefix = precompose_argv_prefix(argc, argv, prefix); + /* + * We need no diff for merges options, and we need to avoid conflict + * with our own meaning of "-m". + */ + diff_merges_suppress_options_parsing(); + argc = setup_revisions(argc, argv, &rev, NULL); for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -35,6 +42,8 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) option |= DIFF_INDEX_CACHED; else if (!strcmp(arg, "--merge-base")) option |= DIFF_INDEX_MERGE_BASE; + else if (!strcmp(arg, "-m")) + rev.match_missing = 1; else usage(diff_cache_usage); } diff --git a/diff-merges.c b/diff-merges.c index f3a9daed7e05..9ca00cdd0cc6 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 int suppress_parsing; static void suppress(struct rev_info *revs) { @@ -30,17 +31,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); @@ -101,14 +91,22 @@ int diff_merges_config(const char *value) return 0; } +void diff_merges_suppress_options_parsing(void) +{ + suppress_parsing = 1; +} + int diff_merges_parse_opts(struct rev_info *revs, const char **argv) { int argcount = 1; const char *optarg; const char *arg = argv[0]; + if (suppress_parsing) + return 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; @@ -155,6 +153,9 @@ void diff_merges_set_dense_combined_if_unset(struct rev_info *revs) void diff_merges_setup_revs(struct rev_info *revs) { + if (suppress_parsing) + return; + if (revs->combine_merges == 0) revs->dense_combined_merges = 0; if (revs->separate_merges == 0) diff --git a/diff-merges.h b/diff-merges.h index 09d9a6c9a4fb..b5d57f6563e3 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -11,6 +11,8 @@ struct rev_info; int diff_merges_config(const char *value); +void diff_merges_suppress_options_parsing(void); + int diff_merges_parse_opts(struct rev_info *revs, const char **argv); void diff_merges_suppress(struct rev_info *revs); From patchwork Thu May 20 21:47: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: 12271417 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 C4FAAC43460 for ; Thu, 20 May 2021 21:47:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA2D3613AC for ; Thu, 20 May 2021 21:47:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230455AbhETVss (ORCPT ); Thu, 20 May 2021 17:48:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbhETVsq (ORCPT ); Thu, 20 May 2021 17:48:46 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B891C061763 for ; Thu, 20 May 2021 14:47:24 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id c15so21602335ljr.7 for ; Thu, 20 May 2021 14:47: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=0OfjDCFK40CHYWc5u5uSaXiZBcYaZsJ1ZH5HBXLLJ+Y=; b=DtxpmHNCocZDIYLvEPmXji/nLVzCqmeRyd0wcTvi9PU/ku5QysLJ4QEdMqeP0YLR0T Y9ecklUUIC5TOMg/7e9JyUmjMiyJcHbK4cMyL2/GEiyR3EiePKX8eZQUrK7mDea6NPLv EthEu1oanVJCXUvdbAV4LD9CY3nXFUzbXs6q/PPF9YuO4qC1conTEITTxTdl6K2Q+LQS 0aaK6VlIM3u7rObE1+bFxYmeZ4ovhGOldwDQNNy2PEyAStm2I0hVH2XVJOcMsL3ROEs2 EqiPh1mIRtZ2TeBctS3MWlj7wfRL7wJmFL+FqfvKPO8FUMyWqOC1Iih6G1ilakddlkIU SgYA== 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=kYnL6e3MZf/6Io0f/vFGztzi83UPygpRRUltVGTAa032npCU4+2UGxMJyCNzKZrq4F ZscCQtNx1fvgBHHsg6qSqNulGb61fa6fZaJYMbS2vVggNeLSjNNujpsWaICZ4Uw5oSU1 jaCN9f6jz11Zlr4iSPe/VTBmauU3j0LerA51hEiUdpXRCVCbkDMXRbXsL45lVxjUV8ac b+JOweE+PcRh7vIJNJ00rgMu+tBs2rWsy2zjnMzwI0nGhPIAIE9gxewtX5kZ/lXtivDi 4rmzQTh/uW6KjtXF+qTudS9kv9zBO1tsEN6h9DC2jtXe3qJtVN0KGFTUnKBKXtuaNzIA 4/mw== X-Gm-Message-State: AOAM533PfE9/VeXs3l0xqyg2qkcuUYQFrLgOKpg3c0X2nBbjnxnU74dv 1mtkgf1FA3dyKiHNZU5ktQU= X-Google-Smtp-Source: ABdhPJxDGO2xRDLs66oJ1/ZQ9UYuKmQc7h4bx1AqUXNKyLjsbG/WTmE0PBg0flgpkZ7ZUOAYB4qrJA== X-Received: by 2002:a2e:890f:: with SMTP id d15mr4577051lji.54.1621547243055; Thu, 20 May 2021 14:47:23 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:22 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 07/10] git-svn: stop passing "-m" to "git rev-list" Date: Fri, 21 May 2021 00:47:00 +0300 Message-Id: <20210520214703.27323-8-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-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 Thu May 20 21:47: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: 12271419 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 4A2C9C433ED for ; Thu, 20 May 2021 21:47:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 274F56135C for ; Thu, 20 May 2021 21:47:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230479AbhETVst (ORCPT ); Thu, 20 May 2021 17:48:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbhETVsr (ORCPT ); Thu, 20 May 2021 17:48:47 -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 A302DC0613CE for ; Thu, 20 May 2021 14:47:25 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id z13so26654383lft.1 for ; Thu, 20 May 2021 14:47: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=FbQncOG/KfycyARQfcu0X5g1uj2Y12NXje0qRt++RfU=; b=dUHnu/MHCA1FgfVSBxUUD34ePfdKZ06HB4PyvbD5NJt2cf75nUlGk7663Fw0/XP9T3 e9M+pJcB6/s+z1waAXiCK08dckRNRz3+URS9VX70WoAgw9E8xpwxkGXjs3yKjQQ4pxsx 4ekPeztJyiEAHPNztC6sb9mxFruRKZDPsH9olgyZf3y4RZzaRtGnXkZzWQyfnfPsMYbj BtAR2JuckxmbsGn9PpwnUWAutCG9LimDpXtTAh29YMMlr7BQPrWEzjZrw1iuWqo/JkzS 4h6wQHVhxQsrdNtey0dh1lbaSdgzTVQN9C1+wBNcLoW4FdaBvGReDbo7BzJvQWlmRGEs pnpw== 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=FbQncOG/KfycyARQfcu0X5g1uj2Y12NXje0qRt++RfU=; b=CGJkmY1bc8fPx1MTKlkz0aZu8ganGIJtEOI+s6wT43RKveXz7EmM2GylzhptvqSR5s fxBSwvhy4irMWKsJnEZN3TiAsTz05xklYZPRdsk1xUPtUciiJHVbSkU66RaewYrcLs7B Xw+5t5iF2IgybOI1MZl9LBL1hxXIqABF5ngjzvKWkOBhosugyk59snOSRg2PQg8Rjfh3 VNFIOPZmxhxKAs6vi278eLjtZTv0tsig9nWUzIwDqz8rW8TDIlbKtJ2ARhTRGa+a+uPD 6Q0LDWfFjsJkNMpYhPVgvswo7S8bDsJHW2E+h5uYLZ6Ewzl9bESjQ9FHU+eTL0vI9Iip xwBg== X-Gm-Message-State: AOAM532Y4xWOG8vW9SsJzql6T27ddR2wvvuY4nyxTYkyzcCM/S/cwGRL o5oIB8Ab2oa/vDKRpEp8TFg= X-Google-Smtp-Source: ABdhPJwofwvKehQdtBXtNazG1FCMYIATT0p4TlV4rN3/+RelW7Fkpk/rYUWF2tWNNVev9O4NSPUhVg== X-Received: by 2002:a19:674d:: with SMTP id e13mr4749620lfj.652.1621547244056; Thu, 20 May 2021 14:47:24 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:23 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 08/10] stash list: stop passing "-m" to "git log" Date: Fri, 21 May 2021 00:47:01 +0300 Message-Id: <20210520214703.27323-9-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-1-sorganov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Passing "-m" in "git log --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 Thu May 20 21:47: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: 12271421 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 C8FE7C433B4 for ; Thu, 20 May 2021 21:47:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A63646135C for ; Thu, 20 May 2021 21:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230486AbhETVst (ORCPT ); Thu, 20 May 2021 17:48:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230474AbhETVss (ORCPT ); Thu, 20 May 2021 17:48:48 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A59AFC061761 for ; Thu, 20 May 2021 14:47:26 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id b26so10630849lfq.4 for ; Thu, 20 May 2021 14:47: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=v7LjQ1nCHmH3DD5i6uodYrBsR+g7A7XW0vpjyrg6Y0E=; b=XDCiG78FAz9tCq04kZ3tiJtaDrP0Hul3TN8Shm1q+uiX2BiFRXewpZqGUpXMbp3mT8 asMiU2DW278mUIPc7dHzVS6evH7d0mn74FIdCO8oZmNpD0egE3P1+oaSxENNtMpPnTRD YGi8v/BfY/42LdTMKwMP458zbQwfA32eocRdHc3VJ63a+XfX+GSRni8d0WPg51CBlLzF EZf89N27cB3iQ5kqFDyuGXLlkmItjb3zPJVQ33wk0Yb236SdBUsi7Hj8k15VlC8EC9VQ i5cwgRs10jE+yjCqc96sNXeU29w2BVx3FQVqHPkiksEyzwCBNC8t8iIFOB6udn6Zrurn fh+Q== 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=v7LjQ1nCHmH3DD5i6uodYrBsR+g7A7XW0vpjyrg6Y0E=; b=M8uK1vxZLR1+sO8ld+0uL+leMrqs5hRr0//+ee67bU9g8nZERyOha/DiU4G1OYwqFz JmiTybSK2S9+jxVqEQv2Dvv4n1qKdPQ/5Ql77W9OfIYK4bjkiX7ZXBvpMQPtL8rWl9CA ZaVgw2yPyrC8s4qLuNH7Ai3sWet0kiMqDFoT6b8QSa4w8FyLoM12jXWaaD4LQDijtanv U3x5e3z/CnEsSivaW5aFFoz2fYJV3hg7u5/KVZ0BOWknV6G8Wu2poJsQ11QBtMkxOt36 UtlFKm8JvSoHV1HezfcrtMpOWJYaKQOHO8EgRmtoMS/OUIshW3L9jtowlwf0J+NuvlwK JA4A== X-Gm-Message-State: AOAM531PYv5Nv4AbnazUsBV/PmNAAjiE+B51qW0owGPrFJo+TJYgvLic BKVI1nJqfDWuWNDimMqxNeM= X-Google-Smtp-Source: ABdhPJzED25w4kwpOFNRF2GUdkAxUqssM9XYcRR5F4/7kgyCFKEE9xCp0toiKbKL+m1wehBjSml1Tg== X-Received: by 2002:ac2:4919:: with SMTP id n25mr4471117lfi.646.1621547245062; Thu, 20 May 2021 14:47:25 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:24 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 09/10] diff-merges: rename "combined_imply_patch" to "merges_imply_patch" Date: Fri, 21 May 2021 00:47:02 +0300 Message-Id: <20210520214703.27323-10-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-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 9ca00cdd0cc6..d897fd8a2933 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -15,7 +15,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; } @@ -109,10 +109,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")) { @@ -162,9 +162,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 Thu May 20 21:47: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: 12271423 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 63BC1C43460 for ; Thu, 20 May 2021 21:47:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4768F6135C for ; Thu, 20 May 2021 21:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230504AbhETVsw (ORCPT ); Thu, 20 May 2021 17:48:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbhETVst (ORCPT ); Thu, 20 May 2021 17:48:49 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A660CC061761 for ; Thu, 20 May 2021 14:47:27 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id m11so26667606lfg.3 for ; Thu, 20 May 2021 14:47: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=6f3yQniBLYFzvcTla8gyHtZ4LDvnEKoUHzoGyV6tYY8=; b=ZIZiSfLtbpWJnznMYYY+ryruh6Nr7HK8tB/SCX+sc3FgtZ/ZWVg50quiIKKhRptKbW QwIwH9ZbIByvWZkQS7d9TrusO9t+YlUi9C2vSSNHexP3LvxQW6PvC83CQJR+IdygoE/Z PPT5kZzT8NKZWtn/3AiV1YcvdSIwh5N2B/MpXVSlei7Zur06SyTW7B3XnDaRlhgeS78z iIBR9zMJgyC/CZkve+LJG7mXIE3QSYpzDterLGEOJ+GmSIWHrn+tgxuZOxJwXeIF04b1 TwQmYkzAt6ITVLDp+x9OtPKkT1QHWbByoEElHNqVoq4E0wyEhUkAA5K/AUKSDvqUwuzK +8lw== 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=6f3yQniBLYFzvcTla8gyHtZ4LDvnEKoUHzoGyV6tYY8=; b=PYVviiz3rfz64eHi9Qx8Lg9awE78PJ18N80yZh0twOMMRPPqJVOQ4X+s4KCow+HJiZ xFRowEfSi2kDlZ8wnOOdqQjum4eNO2ZBNrTXGtXWjUEeta0Q4KI0Ug7durV5/4IvfJFq 5M8LT9akDc+eUN4Dih2fZyfILL69rbRScgqPqipGyuyB9TAeVmdmCn2EDtQQUTmB3Tl2 QAfng3b9ZOmbE4qDq1FZ+1XpMd0F1VqGAsCHNDy3zXAveESb6syIWSQtUVoUoOMuVcCH dCzI4TqhmTLss8aLiyjvQRRFYZcWLaR1oXl1+wAw2nU6Ym1P4WaUce6qN+7jlmq7pMq4 vqlg== X-Gm-Message-State: AOAM533shHGYzw5PYDCCGyqfIFfZTFkQ02DO3m+IRI6FB0B3DwN5FilM dX9byjq6SvyKUEBKVd98ztVGTV5G3Ng= X-Google-Smtp-Source: ABdhPJxC8w6u4r9E1NoBds5IxQKOeQEcdVSrzlFYtxVrkaZkZoA7OqteQm6aC5Y6HxTqQrLHS+8xdA== X-Received: by 2002:a05:6512:2253:: with SMTP id i19mr4432851lfu.92.1621547246052; Thu, 20 May 2021 14:47:26 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id p2sm408414lfh.31.2021.05.20.14.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 14:47:25 -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 , Jonathan Nieder , huang guanlong , git@vger.kernel.org, Sergey Organov Subject: [PATCH v3 10/10] diff-merges: let "-m" imply "-p" Date: Fri, 21 May 2021 00:47:03 +0300 Message-Id: <20210520214703.27323-11-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520214703.27323-1-sorganov@gmail.com> References: <20210520214703.27323-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. Change corresponding test accordingly, as "log -m" output should now match one from "log -m -p", rather than from just "log". Change documentation accordingly. NOTES: After this patch git log -m produces 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. This patch, however, does not change behavior when specific diff format is explicitly provided on the command-line, so that commands like git log -m --raw git log -m --stat are not affected, nor does it change commands where specific diff format is active by default, such as: git diff-tree -m It's also worth to be noticed that exact historical semantics of -m is still provided by --diff-merges=separate. Signed-off-by: Sergey Organov --- Documentation/diff-options.txt | 8 ++++---- diff-merges.c | 1 + t/t4013-diff-various.sh | 4 ++-- 3 files changed, 7 insertions(+), 6 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 d897fd8a2933..0dfcaa1b11b0 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -107,6 +107,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; diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index e561a8e48521..7fadc985cccd 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -455,8 +455,8 @@ diff-tree --stat --compact-summary initial mode diff-tree -R --stat --compact-summary initial mode EOF -test_expect_success 'log -m matches pure log' ' - git log master >result && +test_expect_success 'log -m matches log -m -p' ' + git log -m -p master >result && process_diffs result >expected && git log -m >result && process_diffs result >actual &&