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=-7.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no 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 495FEC433E2 for ; Mon, 31 Aug 2020 20:42:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04ECB2054F for ; Mon, 31 Aug 2020 20:42:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="jqV1EBOx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728958AbgHaUma (ORCPT ); Mon, 31 Aug 2020 16:42:30 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:63382 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726102AbgHaUm2 (ORCPT ); Mon, 31 Aug 2020 16:42:28 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 37A8582253; Mon, 31 Aug 2020 16:42:26 -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=2CNifbiOxXbvUeKyY1CUp3542AA=; b=jqV1EB Ox/MBTgKUO7QbOcjXA03fBwXobM5BQ9ViXWHYwmNnM/3Q1pxvPTblI2AZano09Ku Hy3d27BkcRMEsSVcBlt29qr+OglUQRo6Hg6xW+5ArWZCYrm7omJWBeYzbedbKpLf bTNlFg/VgkaO0nxC9qfFgC+TICNTFj0o6N9CI= 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=QzTUhMo3kKpRH7VUvcBKFMR1tQgMnETH b/mtvTkkiirfIArv/fOJcpa7EevFYp3vi1M5gDT3JLpDuIDR2iB+yhIVEtMm/gw0 +J33fxtzLh6TaQdHr96wi3L7IVRl1KI75ahYnHVSq3tz9Km4XD7dsJ0irTluZpWX Fn8pUU+9IMA= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 2F4BD82252; Mon, 31 Aug 2020 16:42:26 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.190.152.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id B99EA82251; Mon, 31 Aug 2020 16:42:25 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Sergey Organov Cc: Jeff King , git@vger.kernel.org Subject: Re: [PATCH v4] revision: add separate field for "-m" of "diff-index -m" References: <20200829194634.23306-1-sorganov@gmail.com> <20200831201422.27189-1-sorganov@gmail.com> Date: Mon, 31 Aug 2020 13:42:24 -0700 In-Reply-To: <20200831201422.27189-1-sorganov@gmail.com> (Sergey Organov's message of "Mon, 31 Aug 2020 23:14: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: 7A67CB0A-EBCA-11EA-8896-01D9BED8090B-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Sergey Organov writes: > Add separate 'match_missing' field for diff-index to use and set it when we > encounter "-m" option. This field won't then be cleared when another meaning of > "-m" is reverted (e.g., by "--no-diff-merges"), nor it will be affected by > future option(s) that might drive 'ignore_merges' field. > > Use this new field from diff-lib:do_oneway_diff() instead of reusing > 'ignore_merges' field. > > Signed-off-by: Sergey Organov > --- Looks good. Will queue. Thanks.