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.7 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 357971F8C6 for ; Wed, 18 Aug 2021 08:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230137AbhHRI4x (ORCPT ); Wed, 18 Aug 2021 04:56:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbhHRI4w (ORCPT ); Wed, 18 Aug 2021 04:56:52 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15929C061764 for ; Wed, 18 Aug 2021 01:56:18 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id h11so3703147ljo.12 for ; Wed, 18 Aug 2021 01:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=iD+k0Fi8Mbh1JFUSPQtUZrN+VK1xO4qT9r0ew8rrvxQ=; b=WI43BvxugkaijvDSUgZydDOFqU02NXB4wdOAkwHcATzUWsFmbypoUCINYzL3Gw3XBQ Jz76+FWGSXDxCc2Gx24oNnAEgerTfbSuUTAP6U5qCin4mj5nnNI2QpHPbwdVDs2rHBwl vO0YFcyywbbVEO5iB8lDpSW0FZT8aHBmQqfpa8x8K2Eiy77+9dr2DoMYGb9qvhc2gVfO 1qIYtRcEo27OSIpm12Z3AHpld6mLpG+Hv9E+OgY/iMnbINbvWPWKvES3DJyu4FoE5fhA HXRbS5tBeleqcSwiKK6khoPDy9ERmsU6Iz8PkI8ar1XdMXeNs4+kgUWS9Acu7ydGIaWp oDmQ== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=iD+k0Fi8Mbh1JFUSPQtUZrN+VK1xO4qT9r0ew8rrvxQ=; b=o9kO4nYWj86Zwf5EkosI3BARua8LK0O4b/p5hJLVQc+uh3pYpVHdCp6dUVDD7Iz9Om OYxYjjVhAcfR0zUS9LiFepr2TBy9Dj3GlAMKhqrQ/DiPUdwpSEjZSzSSOUm2Ch/6OZ94 ey4XoQ6wnWyUHa4Kb/2iUn4RnnUEL11NToNUHUUOpkJLVasuN+x7vFDzCe9FN63XsBQp RdkNdizXGYh2g2q/w+caLtjkhW6iHKbyVSoFsUknoW0c/yCS+EfcEMGc6FmVfBuYTm4V j8TBJ6jhdkfFm0swnJ+cb32Jp/vgbSKdVSvM4ZBuLBZscTUxoMWy0K8RIDkXogEz+Ql4 blpg== X-Gm-Message-State: AOAM532tIaSEdpnO+bUz/veqiszdv5uqsS8JoTT8GrmGrmjdF+uP+uvK dKH6uTxR7A3YVZVyB433tck= X-Google-Smtp-Source: ABdhPJz0OFxgbQHPVPTd1Ao9X3eQDES+I3lGQiBarhkaOkAgT8u9RTp4OLiTS3/XEjcEA0waH0L3oA== X-Received: by 2002:a2e:3c01:: with SMTP id j1mr6862582lja.230.1629276976502; Wed, 18 Aug 2021 01:56:16 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id d21sm518470ljo.70.2021.08.18.01.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 01:56:15 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jonathan Nieder , Jeff King , Philip Oakley , Elijah Newren , Felipe Contreras , =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Alex Henrie , huang guanlong , git@vger.kernel.org, Hudson Ayers , Taylor Yu , Joshua Nelson Subject: Re: [PATCH] Revert 'diff-merges: let "-m" imply "-p"' References: <20210520214703.27323-1-sorganov@gmail.com> <20210520214703.27323-11-sorganov@gmail.com> <87a6lgl9gq.fsf@osv.gnss.ru> Date: Wed, 18 Aug 2021 11:56:14 +0300 In-Reply-To: (Junio C. Hamano's message of "Tue, 17 Aug 2021 15:10:55 -0700") Message-ID: <87fsv7f7wx.fsf@osv.gnss.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Sergey Organov writes: > >> So, do I get it right that there is actually no reason to use "log >> --first-parent -m" anymore, since the time the much older commit made >> --first-parent imply -m? > > It was necessary for scripts to say > > git log --first-parent -m "$@" > > if they wanted to optionally show a first-parent diff for a merge > when the user of the script passes "-p" in "$@" (and not to show > patch if the user does not pass "-p"). > > That changed with 9ab89a24 (log: enable "-m" automatically with > "--first-parent", 2020-07-29). Yes, and since then it's no more needed to say "--first-parent -m" in this case, as "--fist-parent" will do. > > After that commit, it no longer was needed, but it still was correct > to expect that no patch will be shown with "--first-parent -m", > unless you give "-p" at the same time. The original change that the > patch under discussion reverted broke that expectation. > > We need to note that the "-m" implied by "--first-parent" is "if we > were to show some comparison, do so also for merge commits", not the > "if the user says '-m', it must mean that the user wants to see > comparison, period, so make it imply '-p'". The latter is what was > reverted. Yes, there is minor backward incompatibility indeed, and that was expected. This could be seen from the patch in the same series that fixes "git stash" by removing unneeded -m. The fix for the scripts is as simple as removing -m from "--first-parent -m". It's a one-time change. > >> If so, I'd object against this particular patch as the pros of patch >> being reverted outweighs its cons, and the original patch never meant to >> be entirely backward compatible in the first place, when it was >> accepted. > > I agree that we both (and if there were other reviewers, they too) > mistakenly thought that the change in behaviour was innocuous enough > when we queued the patch, but our mistakes were caught while the > topic was still cooking in 'next', and I have Jonathan to thank for > being extra careful. So, what would be the procedure to get this change back, as this minor backward incompatibility shouldn't be the show-stopper for the change that otherwise is an improvement? Thanks, -- Sergey Organov