From mboxrd@z Thu Jan 1 00:00:00 1970 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 93C71C433B4 for ; Mon, 17 May 2021 16:43:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77E9F610FA for ; Mon, 17 May 2021 16:43:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239607AbhEQQot (ORCPT ); Mon, 17 May 2021 12:44:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238338AbhEQQon (ORCPT ); Mon, 17 May 2021 12:44:43 -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 4E8BAC026CF9 for ; Mon, 17 May 2021 08:58:41 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id i9so9532448lfe.13 for ; Mon, 17 May 2021 08:58: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=nhQE+4C3s4dZyEuryZBTEMAFU+w/YgzcSN8Qkvty+LQ=; b=cbPHvo5hizp1u48ElMGV+VT/niCAGFQyeFJc52czaKhR+cM2auyasXF9nlQz3eJflh ouTJAWJr0vlkZuqwu1qqrKmjaTSuDwqCYsLEvHa+ShW9UrMaL//tJH5yvD3a1L3QgtFN ld3zhHZ4YtoDxELL9jUxEV7rQ0e//3nzPvTYN+oAj0dpG8glHK6cn9pU62FCO9TzzoUJ 10TfGLYAmVLoHrG91dJ8GWeFHIwhWY+AycDBU2nMleWzcav/konxK+hpAEwLzANpIXK0 +wt9or6fLk8zIDByml838Hd4L31GkzfDzr19LUdh8QszeYJzbqA0aWK+PNdwbWWYyEGS pJhw== 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=G62lO3Qy1UwYYsxb9VjXtBjRsVtG5EuJAEC9oFnyt2LBJP4m61OybRg/ZBC5OZVvXO up72NyM8qAOOcBnH5s8usj6PVtujUPqvY10m8YTwGZLM3sAU/FgLDRPG7SYCVQxieSj0 xRuABEJVgf02HYQulnbqvQhQ6UXfJwISZc/73tRg+NpfYKbHrnABhzFK4TBwNXT+4vBB KPqeg1rV5erBFJ+ErikDohiIlcFMXREW3NNwKUzPbH+nt2jYZKOjksYmyLomOkGxfxyj acOEU9fwO9/V+59N4tOxSsVFwe7KiLZdnfnM5dDIsHFjSKJn1rdFjHepndg/6iGjokvg 3qyw== X-Gm-Message-State: AOAM532kv2UtgZ8XImA15cJMmtnVoBbdVssYpmVl7M434I7uDaogBT9q rwHf0b6lCg+vDZ8mrBpK+QU= X-Google-Smtp-Source: ABdhPJwuAdmAKkZV4GERLHt0EbTxKYTnqNpd5OHrJGBryNOEXfb2bqASEryNfghMGK1WC5Xxag94JA== X-Received: by 2002:ac2:515b:: with SMTP id q27mr410907lfd.224.1621267119872; Mon, 17 May 2021 08:58:39 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id i8sm1996834lfd.12.2021.05.17.08.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 08:58:39 -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 v1 2/9] t4013: test "git -m --raw" Date: Mon, 17 May 2021 18:58:11 +0300 Message-Id: <20210517155818.32224-3-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210517155818.32224-1-sorganov@gmail.com> References: <20210517155818.32224-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_--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 +$ -- 2.25.1