From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 4A9A41F934 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?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , 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 Content-Transfer-Encoding: 8bit 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 +$ -- 2.25.1