From patchwork Wed May 19 11:45:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12267037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A784C433B4 for ; Wed, 19 May 2021 11:48:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4703D610CB for ; Wed, 19 May 2021 11:48:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346237AbhESLtz (ORCPT ); Wed, 19 May 2021 07:49:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235384AbhESLtz (ORCPT ); Wed, 19 May 2021 07:49:55 -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 D4F39C061760 for ; Wed, 19 May 2021 04:48:35 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id b26so2650968lfq.4 for ; Wed, 19 May 2021 04:48:35 -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=7dkgZsX2HyqQXzwicqV1ASn7xJG4Xe9wKAEfsARmcx0=; b=TkI2C9reK0tFJy1mj5AjuX+fbR8BQsgkDyCEuGmpdlPUAV63qtd/4h6nB7cb8bv23j 33TWv558i4KWosfDGEopbLg48GaBfN9NkWc/TYbE3aDhrgU/8Svor7feQu13lb20Q+nr +ydEYffp8Ob/Yd4wNNx85FfieMJCtjMass7xW8gki3p03cSp9JGoYPqKE5ACX5PnC6vz jo32Y0ggOQBVJaMJH+TRx0tSzamBbVFF6+vqEcMJVZFYzCd6ylJa/o1ZKRO08vjjiemd uJSGZ0J2r637jft3wX53CMSfOHqP+GUu/nlp6N/17jwij+/QHsVtH/uK5Brl/BtfmJol qjig== 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=7dkgZsX2HyqQXzwicqV1ASn7xJG4Xe9wKAEfsARmcx0=; b=NOH5uwi3TPREJ87HQ19z5V9dki4WSPkpSZl34iqUA0RC6wWDnfz27LahbhVJb2zYn1 T9NH5gJECtBGEFlDcPNjpbCTLlhUtREdXYzlYVkuyy0Ssa0T8sH5WjsJjIiMWb13/eZj Yd0imNH29hin6sFPZiBBijZ0A/yjW3eKqNamnQZMv2ijUoNDD3NzSIhWwGBTIpGvadDY cvtQoOB90RQ6fsCtfQUnfga3jMQaMldRStDtaaOCtVhm9S6198I/avR9cc4VFoA5z/6R NRB2deXyj16SSjTbzIYeSPVAi5e+cWQInjW9yjalxg4qQKPsX3sUD3R6PLZhsHxydx91 EWfA== X-Gm-Message-State: AOAM531eGU0EZrOhxTJc9OoFHTMvY8EWjRVunBdtrPn2bi/jhMZGQcIa JRxo0NWGz2ZVjVwl+IgHEN4= X-Google-Smtp-Source: ABdhPJwX2KqZTBTDlDRLuCYcu8YiVUbJ3gzrUcTjoPoRR0JM03PBGcv1urKEGFbDjRj2TmTE0smC9w== X-Received: by 2002:a05:6512:139e:: with SMTP id p30mr8274570lfa.489.1621424914275; Wed, 19 May 2021 04:48:34 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:33 -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 v2 1/9] t4013: test that "-m" alone has no effect in "git log" Date: Wed, 19 May 2021 14:45:44 +0300 Message-Id: <20210519114552.4180-2-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 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 Wed May 19 11:45:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12267039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FD94C433ED for ; Wed, 19 May 2021 11:48:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6E9A61004 for ; Wed, 19 May 2021 11:48:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348926AbhESLt5 (ORCPT ); Wed, 19 May 2021 07:49:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346288AbhESLt4 (ORCPT ); Wed, 19 May 2021 07:49:56 -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 B424BC06175F for ; Wed, 19 May 2021 04:48:36 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id h4so18675922lfv.0 for ; Wed, 19 May 2021 04:48:36 -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=igCuTNhSbqHpBVP1sxw6ySd6OcZxsee38ZOOmRtZ2m7fSJ856AOtfvwRAC3WimPck0 8c5F+drRLiF4n+M/WO8nz73ZMgADPe4Ej05+p3pivTxFPZ1mJGEc9QA4V0sdBGpG/a/e TmWoMhQkzLtAfrg2yBasdz/ZG0fNWILrpPCNizixoSqwQZEQaY2qzIGlD1ILI/R1B7Gd gaHbS83myuraI1UfFBO0RELQw5jOLCDRnNllv9Ulu3XFOXveS6GEVHeykpMy++Hjr0q0 cj2BiXIxXuw5ddx/njhaiGCF+gTsBfFb1s4bVzCKnnN+Ener8RJtI+bfV2cQ9/YT3kM5 kg3A== 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=qZEzlFL/OJo2kxd6NHfhShOTaEP2kfFoelUtRW74csq5WbVCfTrmZ44HP1qKcFFkf6 paxrz5wse6B4gsKVX91PxmqjURKNVXTSRq8/+SxwYIlWcYYQkaDKWrn+r2Y3iFuqetza uYWuBG1gr/RoBdaFlP4pHX6E35inofK/7ZAuFcQHYWyt9S4gynDS2g8EHWaLjbBK5u07 IrJuW7WYViE/JyYpj7qwXX0ELJmtXuMJFTZhz7sC7UuP3NutsR155yoQrnK0WMWkNowf bDuRH+4nGJ0Lz0xrnvUDlMEoW0qUqE4ww3QISyG4B3md57g8FMvrWgswYWzabYSKXUWA t0FQ== X-Gm-Message-State: AOAM531lb4xiSfSIaA04sjs3fIojEX64pAX+GjiO7cw8K32SYDIFurUY l+4ByS8bbzK5it7YO50Gixw= X-Google-Smtp-Source: ABdhPJzsWqi/Vr1J8WGlfSfi6x6FDLK2Vm+PURw9jRD/rQLq9Cz1BgIyVkZYAQgUvlmwPTJxZ6jjQA== X-Received: by 2002:a05:6512:c21:: with SMTP id z33mr5871422lfu.539.1621424915111; Wed, 19 May 2021 04:48:35 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:34 -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 v2 2/9] t4013: test "git log -m --raw" Date: Wed, 19 May 2021 14:45:45 +0300 Message-Id: <20210519114552.4180-3-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 Wed May 19 11:45: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: 12267043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48CA1C433ED for ; Wed, 19 May 2021 11:48:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A57161004 for ; Wed, 19 May 2021 11:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349250AbhESLt6 (ORCPT ); Wed, 19 May 2021 07:49:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348544AbhESLt5 (ORCPT ); Wed, 19 May 2021 07:49:57 -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 89B6AC06175F for ; Wed, 19 May 2021 04:48:37 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id h4so18675981lfv.0 for ; Wed, 19 May 2021 04:48:37 -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=hohALzj1U0R9Svqmpdf2APp9G7zvDylOpQiua1BK4wOlaggQLhXwoWg2Lu84g8hES8 ZTozhTZPE5EBHcxcZLzVJwNilEH4yPSh9UdW+WXpfrEa9siTFkL6xMg0iFkg/6zqnnTG wFCjIOp/4RKAM8/cJ3duuLUVuABjJE+tr0P19SAtQ+Qedlt1xqRxeCv1o1EoPB4HzbwA b8go1UxNlnQURzQq3X45Xp5OM1HJRB0v+a8IY3aFYyMIP98kGG0xdlPLhPIeuQ8Bwlnf gxKNlS61GP9C9LH2ObKm5Xz/gVN7wRKt29NgALOBQZv5+41LeZTXa2DxRfG778Y1r5Ze 331w== 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=ky0NY2pXRk2D8u7g9HNO9x75xR0tKcvaU1sq7wP1Msk29BBeXJ+P1EUbfUsDyMk0OA tXMI74iiIgRpm8RNLHTmexjK1rnK080X2nDpUBoM6VR7z6E+zk8IlNwkKOmYXmVypGaa wci/H7OZmQCP89+CMVX+fB5YZ/Mh7DPrDXbZxqlqr+QwiMmAgTnCN+WcI0ew3Mwy7la3 tZJSJTEq5hyFiV2Iq9LviWZ/UwDHZqCONMZ4wMMFHQUWwpuX1B3+L26UKtB0YKfFRc0e qLDmmxLfYU/Mc9x7++CtkUoR8reqJXdYGaHejQDVGFyMoEHtDx3uLqtFT5GsJo0nYg3B sgTA== X-Gm-Message-State: AOAM531D1LH1OfZTFoIFZjpYVAlZZVOb5HHf0jUqMryRTQIe4lPVgE62 Ks2ZccJPLA7XG8MN1wGvxl8= X-Google-Smtp-Source: ABdhPJzVT/cfaU/Tq9YRiCa83yUuIxoCn/M146Ux30NFovS7nSN0p71MwoKx7Ce8A+5Ln9UvlI3YJg== X-Received: by 2002:a19:5208:: with SMTP id m8mr8523888lfb.372.1621424915953; Wed, 19 May 2021 04:48:35 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:35 -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 v2 3/9] t4013: test "git log -m --stat" Date: Wed, 19 May 2021 14:45:46 +0300 Message-Id: <20210519114552.4180-4-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 Wed May 19 11:45: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: 12267045 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A899FC433B4 for ; Wed, 19 May 2021 11:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C3AD61004 for ; Wed, 19 May 2021 11:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352435AbhESLuB (ORCPT ); Wed, 19 May 2021 07:50:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349246AbhESLt6 (ORCPT ); Wed, 19 May 2021 07:49:58 -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 6E672C06175F for ; Wed, 19 May 2021 04:48:38 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id j6so15947359lfr.11 for ; Wed, 19 May 2021 04:48:38 -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=05utSWV2L/QiUJh2+Jr8LiKrgu2RAKe6xUFhGGiDPWs=; b=QZo9e6PAQwXAo5OH1lbeFq/Uhff/vtKunNV5Q+bZ6JeOC/USk28Vu8Wkih7PIvgJD2 H6WEmiBsJNZJajMUbzvDSGkQjVbET8BGGBKfUxXrZzB0sKRRooGkxM+yZwStgL5cGFRI YuNeh+nma9pB4fjQML21kR7zwgPbTuMFIIBP6LSOLkvrO9rvy2T9DPzy7AasfJ9AN/za 7FItsoDYAXU5VD0MldwxeNFpaxHznJh8fuM7Uw5O1oK3PxBaKL74qsnd8GcS+r/dJj0P sTW5EpdvDl3ocOgiAGQDFlyqQIA3f5Uj4XZVnVokiENnhX3NaZ0MkVkqHGjeEpYuDsEZ gjZQ== 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=05utSWV2L/QiUJh2+Jr8LiKrgu2RAKe6xUFhGGiDPWs=; b=XXLV0YwUcJO4DnMk4bqErQzhkOXs+G18h9GV1cOjmBXYKWtLDFf+nXc+wTC/yy271d zbnIUKvXIj+9emrpyFNSLRpBBPXjcJthgrS6SZpVPG6AL1XtRX3ddgKpquk0d9hDPae3 onp6hWj20fAWsJIyA2q8i2YsdgHA2wlRydOFV8JX6+gCDRypJF3+4lWkQ0OOxLg0d5SS DwhB0J8ipmxSi6vsB5oBraQBfBGJrOUhQevGgmQAV3DIf4ku8Wjjsab1+yio0GeGtCWJ RgJAGicIt2uowdagsS823xQOxWw1Ro72DFi6Ogu/iLhjebN9X07x+Xor2qtE9BtLh/XD 9XtA== X-Gm-Message-State: AOAM531YLT8rKPKY2Slp6NUzj4tRB7zgbbg/sQclui06//PMnMHGd3NC RHWK5Boo9nULQPTEGyTvxCr6Q+kaf2E= X-Google-Smtp-Source: ABdhPJwYpoEfgXUtvMqfx6HGrZayn2CD4inSTDcROc5inC9W01XfbpzI6ifXfSjJjH8yltatM06mNg== X-Received: by 2002:a19:c107:: with SMTP id r7mr5669744lff.247.1621424916831; Wed, 19 May 2021 04:48:36 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:36 -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 v2 4/9] t4013: test "git diff-index -m" Date: Wed, 19 May 2021 14:45:47 +0300 Message-Id: <20210519114552.4180-5-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 e53ca7aa503f..c35cc73d08bd 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -493,6 +493,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 Wed May 19 11:45: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: 12267047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 AA0B5C43460 for ; Wed, 19 May 2021 11:48:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B84E611BD for ; Wed, 19 May 2021 11:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349615AbhESLuC (ORCPT ); Wed, 19 May 2021 07:50:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352286AbhESLt7 (ORCPT ); Wed, 19 May 2021 07:49:59 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53028C061760 for ; Wed, 19 May 2021 04:48:39 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id h4so18676119lfv.0 for ; Wed, 19 May 2021 04:48:39 -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=OnwdB1o8Xph/i8+YE5RINyo3yiO1YyHImbSTL1kwbaATBnvAn1JR6BM5oyoG+WCdFO 8yn5rHc7crE1U9i8+2/JQQQRFT85j9wkSQx6ojOXhjU1MAnTr2UHSpykwqU4nPAyKKju UuXD2jzN6TBi/5dWl4eyfZKDGfrpIkgVZvtw289j1Xfyx4iHub1T7v7VhBxuuPaWlkoq K51IxOBIbkONS1HDx7D47Im1fJJ+bUh/VNhBKpYAXMs7Z4WAVOCkRPVeXwAl5OZ4PnU9 b+krctlglgb6ayAQhmYTeVAadoKfDfWNUsT1/TR1ptQCe0Wioh9HlnHLPyqGn/pSG24D rFyA== 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=Se2G1YRyUTK7fPl9rJddXuPYVQCo1YiDHzOlkTf4wFmOZ0mVqIVWMAMaHoh/v0H/nr jcV87Qu5O6XzwFFG2+5J5bjmeZJQDNR/dFPbEs+UU6c+bOfMRbhTxOem7APlTJ64pR6c DjpcXHTrlI85iLlFlDC+8/Qi3VFcOuqJrigvi8m2CzV18h7m6fh1fGNnhhGhIzVCPWRg gIOmuIs1eaSqncQQAvnBQW0rZgS8bgMYRkuJzfNnxmyDj640Hog511E0Lf+SjhHFsK6G 8hvp6KdBiD8w/wi4VByo8UESwKOGZnVIcq6sZSzIHWEtngFeJ7SSLPdQBdCKm4lloWja Yuhg== X-Gm-Message-State: AOAM533uTQQylNmob4igz1TjfIOYh418+XPd/dP+eevhrIqiKQh0QkiI dcrSVGNkAJMnNtif0AWJ/B4= X-Google-Smtp-Source: ABdhPJwwAXc1jdBJUVxIfZzAGaoNjtxW6z+03rzFNRkYIRhS3U3UQGgVg8HtMDGBV4LzPfBjmvb85A== X-Received: by 2002:a05:6512:128a:: with SMTP id u10mr2941836lfs.378.1621424917725; Wed, 19 May 2021 04:48:37 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:37 -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 v2 5/9] diff-merges: move specific diff-index "-m" handling to diff-index Date: Wed, 19 May 2021 14:45:48 +0300 Message-Id: <20210519114552.4180-6-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 Wed May 19 11:45: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: 12267049 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81960C433B4 for ; Wed, 19 May 2021 11:48:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 654D861004 for ; Wed, 19 May 2021 11:48:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352451AbhESLuD (ORCPT ); Wed, 19 May 2021 07:50:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348544AbhESLt7 (ORCPT ); Wed, 19 May 2021 07:49:59 -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 288F8C061761 for ; Wed, 19 May 2021 04:48:40 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id j10so18589160lfb.12 for ; Wed, 19 May 2021 04:48:40 -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=EkKATFkg89Grre4UhICzRZO0wa4ASpBmYo0I6huK17flCzZ+5HZMqrPShl1SvQlmtc GHmr6luw7xlRk32rWNHigFnlxl18G+5N2rB/Ho7tz5hNYzPcM7tgp3jmw5hf9YJhpZdC 9I2wZJebFiZRkhfBlGRmYwWc/mcRO2vlzTdu9tv9nmBqT6ty54ybLmdaF7mJkmRV/ht1 fnyyJZ/82fRay9blWiFZn96MJ0yeMGIgSbGc+g3ohU6ZoDfnF13BnE3ItUF52b+fec70 uuNcXfgd+S0X4Q6ZSNEV6j5GvJwwK/nnNLLypBGKO5rCR32VwKxsAt2Rie0UHHFTPZaJ i0Eg== 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=ZiaJvqqsvbwt59szxd4640V6URnYUdjLLzqbkPVJxsp+0GYooO2Ln7tuxQynTL6xRS tBTJARnYLvVp9acJ7T7NFVq7eWNnsAgDjPD6C9rpmXRl/I5ncqu9PG7XCw2rsql0EfpK /3OkT0Qfh63QNhMivscSjr+L7BKSIsolPmLDrCK3jnZMR13vkPfqfYg25ERl4biir9QM a4YG+kP9qMZYcwcw00+cwY3eeWyAGiUCB0fwlX8F5ogEm6+HuZKZGbWRrnFb3H9CHz0k Q9NX2PaKXhJgcp1dd3Jc+jx8oibG988GK/Ya/NHKPTwYl2y7NAhmnHIbgkjhZV9zZxzG Assw== X-Gm-Message-State: AOAM532//qAln1Q/OjTG2zmuXLqwpchm8UUL5PucVtwaaVsyvWaAPjvp TnBtMIngPFZFnpp0V7aonvo= X-Google-Smtp-Source: ABdhPJyolRd66yCMPNKALSHWK5ZeG6TOVYTSToI5yBVpqavfn8+o+ORwG5TCpnxMhfp9FQscB81DHQ== X-Received: by 2002:ac2:4470:: with SMTP id y16mr8690281lfl.266.1621424918545; Wed, 19 May 2021 04:48:38 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:38 -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 v2 6/9] git-svn: stop passing "-m" to "git rev-list" Date: Wed, 19 May 2021 14:45:49 +0300 Message-Id: <20210519114552.4180-7-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 Wed May 19 11:45: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: 12267051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DF9AC43460 for ; Wed, 19 May 2021 11:48:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 533A7610CB for ; Wed, 19 May 2021 11:48:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352459AbhESLuE (ORCPT ); Wed, 19 May 2021 07:50:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352416AbhESLuA (ORCPT ); Wed, 19 May 2021 07:50:00 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E67E4C06175F for ; Wed, 19 May 2021 04:48:40 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id m11so18637485lfg.3 for ; Wed, 19 May 2021 04:48:40 -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=b1Iu2Lc08rG/ZGSV5Za4Y3yzY1ptHDD991rCut1u/WX+pTABcRpdZmbpILpdqvVl8E Ym9nhPPYgmQJxe6q0HpkPdcRIBkMxerBAsacsKS/OjgZpaHyDKlmohVxFS305VN9z9kr 5L3GVlznWvuQIl085KZmqkMzw91mLOrftC4aAKgpZ7AipcPnoT0TNn84NuSpZ+4Kq/Od un7bi2tpLQ3kH15uEeHbONro3y6dTP/G8IqpVYpxKGIudNcuKkMf44oZCYBHkQtSZ7dh xLBK/xx9SMG8tqB7Qsbuwe5M0CV13YKirJcuTZAiFIdNRvCdgfgv75ocaYT1yC5JOM+8 Hb9g== 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=WqcpMmKYJFBXtpMlcr/8haTaVUQw+CE5heePDR/P+es++1OAx4uiaMhB1WoLS6xkbZ BlvmYYt4mjsTMLxOf1s5PG1FT1wY9tGZ5jkfm1JW+1ALsK/aosKAvbfsDjYajhaE3gdx dShustGtr8DebvpQZqPBPX7bgAuSvzT1txsstf06LRQ8NPVmCUhR/Iztt0KoZLKhVc3G X3cUl9p7DUGh6c5RfmGTqm7L3JjXON97FTk2b7WkwNq8rptO5bNbRYyeqAS4hsrvfqcl 4Hrogiqm8zkjii6ivFnIp3PP++GDFBF8uEiq8hZUEC9nJ3YjvyxohriBia1W8hhSKMUZ EsaA== X-Gm-Message-State: AOAM5320wu/SMEpNNwFzye8NjT7YVz81IH9WSjQZyXFxKeE0JhDzZsUS Lw1OCqEB0uR8LCM+rHACOY0= X-Google-Smtp-Source: ABdhPJx07yd6odZvbj0n36REo6zSdPrUYkjdGCCXF7iCC9ZydGZAfo+Ffu2RgMnve5JcKGzAWxCFsg== X-Received: by 2002:a05:6512:693:: with SMTP id t19mr8251805lfe.91.1621424919352; Wed, 19 May 2021 04:48:39 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:39 -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 v2 7/9] stash list: stop passing "-m" to "git log" Date: Wed, 19 May 2021 14:45:50 +0300 Message-Id: <20210519114552.4180-8-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 Wed May 19 11:45: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: 12267053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 9D65CC433ED for ; Wed, 19 May 2021 11:48:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83AA761004 for ; Wed, 19 May 2021 11:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352480AbhESLuF (ORCPT ); Wed, 19 May 2021 07:50:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349331AbhESLuC (ORCPT ); Wed, 19 May 2021 07:50:02 -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 C9FA6C061760 for ; Wed, 19 May 2021 04:48:41 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id b26so2651430lfq.4 for ; Wed, 19 May 2021 04:48:41 -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=NqmOIRuntpga9l7PIz/C6whuV8J52U2dx2+A6xnehNrGYax9rXaAG9uClmZ02IMRs8 4v2zVZyuhOHEJCFAcPCoMGxr+D3S0OgWc0KKvqU2Q4sMGEEWS13sUhuTyMufaB4Sykvq mSnLB9v72Mhq3RaEkgtQDwKoqvvyorbnq0MJRcbLNo24q9Yuejp7BnB+HqY8Afr0G8aI HOcSMNqRBSQY0GXf7Qus1E42xEW3G6DRbWin3HTb5kgdF4fViWJ4Vved03AYjDZo7MUM pVmr99rmLqsjRHRq84u5YVWLRec8GexAV8V3gmpWE8RHy08n0ICZowmm1JMsfgQwX7Tw CT/w== 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=fxlEV4HtgHFNZexkt68Rr5t5zw7lEs324EbQ+aELjnNO/zKwXmEzsBEitqNMeeV8tU KfV6KqzGrsj3Ry0ETdX9bOf4UMfdUdUDfiJPgx+SlFv5sj0roZo5izen7ob+++OWlN/r A9zR1KdVIHEkNMBNZwqObr23AAbOPvlHfOfgA6K0LRXcdoODX2Nc++tbrmCbjr6x610f hxvy1t7INuN3DxNU9Lc2am82QjcJpNyVrajP4OqGqW6n1iEAjjKe8ik5yuK5tfL0yFli FipKo5c+s7V1fyXPCzuji0YCLiCWLfxgwQ3caJAXxgy/fm0zq9dQG3FwnrHmTksedU/9 5MKA== X-Gm-Message-State: AOAM533H4KT2Gj73+BOTcxZKzShkDYcVKpp0yCOAMHkmZe4+4MWWgHpn bqWwRJmib9CaaIdYFE8benc= X-Google-Smtp-Source: ABdhPJxD6l7MZDuGgikrT3nl3nF+BJsbZoenF6o5Vd/+oegKE5HPLLB56IzkV9OmEvl7N37S5sXX7Q== X-Received: by 2002:a05:6512:3d1c:: with SMTP id d28mr8074044lfv.21.1621424920187; Wed, 19 May 2021 04:48:40 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:39 -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 v2 8/9] diff-merges: rename "combined_imply_patch" to "merges_imply_patch" Date: Wed, 19 May 2021 14:45:51 +0300 Message-Id: <20210519114552.4180-9-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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 Wed May 19 11:45:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 12267055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE702C433B4 for ; Wed, 19 May 2021 11:48:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D4F9611AE for ; Wed, 19 May 2021 11:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352505AbhESLuH (ORCPT ); Wed, 19 May 2021 07:50:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352396AbhESLuC (ORCPT ); Wed, 19 May 2021 07:50:02 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A15EFC06175F for ; Wed, 19 May 2021 04:48:42 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id i22so18500723lfl.10 for ; Wed, 19 May 2021 04:48:42 -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=+U6jX7XPraaLLXcDgAFCztBcR0yTeez5iSqNC5PCEQQ=; b=j4jmjxl0BjGWTrsO0144TkaJGQvwty4eNfreJaBn2Buh3/VnBnRE3dwghRtwRSyhmX v19feYNF1tIwAA1gLbOlnA+tp9WaZJYzHWkfrr3bygWH/EjKob0WupixFbo6EUVaPzLq JF+qsx4QKGySKvaeo9XjTh+00BPxrMLWsUHpDaRK68F43n7A3KVERRp4lPY30iN3V7Jd xtLoTwtyzTgILZn4rfViQmFPeVlxMHvSnUlHvi6+Dt653X/WA+FL6CuRSBQ59mPT7zXB Wf0bUWoY1TwGaEceOqAUA/elMyUSMnR6ZWMEFjrAV5Jw/CiBJFFbQCCEXvQqJDyZ/J6z enqg== 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=+U6jX7XPraaLLXcDgAFCztBcR0yTeez5iSqNC5PCEQQ=; b=kogKkE2v+6sVmU7rrDZJJR1+DecfRoti0aZPHclNcICnhIUnKzOduhM3JTDAvUvp45 3+Yl4KGIoE+NYSQtNT8LabH29lNsxF6BPdYWuYHyo17/A2h7fNLq0MxE3ZhAWq2x5GJl QvYk3vhYher7FM3o4q3UpNMxveEYPQgaVd0Hja9lVfz6qpoOzWNKSda5z+gX81FKEo1O pKUA2myEuC/qHEnrjeiHBfUJS/wbqmotFfWYpb3HO6kcxNh8DRRc0QulFu/quibcN4/7 vsS3YHL43ZpnJYZEZnx6fEDPFrtDWN+1KuOKuLbGSOp7YgmzwDhS1jQYcARq096gxWxN QOPA== X-Gm-Message-State: AOAM5333WeMEzKaiFhIjOdAT+vEBuRN8TThKPV1TJCWY9BBq21EzKgXH 0+TTwe2QFco49AoEBbthcJc= X-Google-Smtp-Source: ABdhPJzVsP5Bz3KbyGLtTpC6rWPW6oRIqgA7dh47CZlgj/+hSf2kDNBeVsGO59VQGuuapCC4pPjntQ== X-Received: by 2002:a19:c747:: with SMTP id x68mr8197127lff.516.1621424920995; Wed, 19 May 2021 04:48:40 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id o2sm1846470ljp.60.2021.05.19.04.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 04:48:40 -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 v2 9/9] diff-merges: let "-m" imply "-p" Date: Wed, 19 May 2021 14:45:52 +0300 Message-Id: <20210519114552.4180-10-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519114552.4180-1-sorganov@gmail.com> References: <20210519114552.4180-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. 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 c35cc73d08bd..15ca3c75bff7 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -454,8 +454,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 &&