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=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 50F5BC433E0 for ; Wed, 5 Aug 2020 23:19:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0B992177B for ; Wed, 5 Aug 2020 23:19:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="h+JR/XIa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726055AbgHEXTk (ORCPT ); Wed, 5 Aug 2020 19:19:40 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:56457 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725996AbgHEXTi (ORCPT ); Wed, 5 Aug 2020 19:19:38 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id E26A2E74F3; Wed, 5 Aug 2020 19:19:36 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=4rrBqm5eDRJni2nN1bGVSRehyOY=; b=h+JR/X IaN/hAQnoZjGHN55clAOu7Y8FKVkTbd8DElsNfO84aECRzDI9z6xSFXnlJOl+WWQ /T3TM+rVH9OSU3ah5YR1EOWaSrNcrX8e87kGMnpvh1n3OymN+eSlpCa9zKjoZqeo 1KryZl9tAnwTmNNyI1GFhfRudMizZasYBhQE0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=UR6Q5RUWiawRX9oo1ccqXkSyB9Z1TlBc PqINwt4Jmva7swO4zDyekIPZ0PvuFjQlCwshotD/9oypfI6uSW122VFTueRw6Puy ShrQ1U7cpA9nS8jHW7Vtb3WiNoDiuy7e3h9Iw2wdjVcQkYTQ/C1jOEQPdCexIEwF +FumZPlvYF4= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id DAADDE74F2; Wed, 5 Aug 2020 19:19:36 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.231.104.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 23272E74EE; Wed, 5 Aug 2020 19:19:33 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Sergey Organov Cc: Jeff King , git@vger.kernel.org Subject: Re: [PATCH 3/3] t/t4013: add test for --diff-merges=off References: <20200805220832.3800-1-sorganov@gmail.com> <20200805220832.3800-4-sorganov@gmail.com> <87lfisk915.fsf@osv.gnss.ru> Date: Wed, 05 Aug 2020 16:19:31 -0700 In-Reply-To: <87lfisk915.fsf@osv.gnss.ru> (Sergey Organov's message of "Thu, 06 Aug 2020 01:44:22 +0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 1ED2DFBC-D772-11EA-B1A8-843F439F7C89-77302942!pb-smtp21.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Sergey Organov writes: > Junio C Hamano writes: > >> Sergey Organov writes: >> >>> Signed-off-by: Sergey Organov >>> --- >>> t/t4013-diff-various.sh | 1 + >>> ...--diff-merges=off_-p_--first-parent_master | 78 +++++++++++++++++++ >>> 2 files changed, 79 insertions(+) >>> create mode 100644 >>> t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master >>> >>> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh >>> index 40e222c94520..86fb11cecc61 100755 >>> --- a/t/t4013-diff-various.sh >>> +++ b/t/t4013-diff-various.sh >>> @@ -298,6 +298,7 @@ log --root -c --patch-with-stat --summary master >>> # improved by Timo's patch >>> log --root --cc --patch-with-stat --summary master >>> log --no-diff-merges -p --first-parent master >>> +log --diff-merges=off -p --first-parent master >> >> I think we want to also test it in a different order, e.g. >> >> log --first-parent --diff-merges=off -p master > > Dunno, why original Jeff series didn't need > > log --first-parent --no-diff-merges -p master > > then? Who said it didn't need it?