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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 170F1E92FC8 for ; Thu, 5 Oct 2023 21:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231828AbjJEVrd (ORCPT ); Thu, 5 Oct 2023 17:47:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229714AbjJEVrc (ORCPT ); Thu, 5 Oct 2023 17:47:32 -0400 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5BFE95 for ; Thu, 5 Oct 2023 14:47:31 -0700 (PDT) Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 9768E37BFA; Thu, 5 Oct 2023 17:47:29 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=1DJm8WUExzZb18Ox6c5UeFWpeVbEEeoJp844s2 BnZNQ=; b=eh4BNNVf4vr7z/fU7yyFIXFVrQk7fTx7HCsQ+oyFC58dFT2ARduma4 Umt/Ls8Xcn00588XhjI2ADcbIPLFpmk/Ouu09cExwrs25c2/Fc4N+j86nOlLocXE 27cMS0rd5m000gnl4hLZ7WTWdBtGeNFTFhX+Id3/nSfOnMH/GGudo= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 910AA37BF9; Thu, 5 Oct 2023 17:47:29 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.165.85]) (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 2AB2237BF6; Thu, 5 Oct 2023 17:47:26 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Sergey Organov Cc: git@vger.kernel.org Subject: Re: What's cooking in git.git (Oct 2023, #01; Mon, 2) In-Reply-To: <87lecgeqfu.fsf@osv.gnss.ru> (Sergey Organov's message of "Thu, 05 Oct 2023 23:59:17 +0300") References: <871qecgpg1.fsf@osv.gnss.ru> <874jj7lh7x.fsf@osv.gnss.ru> <871qeay6tz.fsf@osv.gnss.ru> <87lecgeqfu.fsf@osv.gnss.ru> Date: Thu, 05 Oct 2023 14:47:24 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: C6053BAA-63C8-11EE-B2FF-A19503B9AAD1-77302942!pb-smtp21.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Sergey Organov writes: > Overall, as an example, I'd understand if you had deflected the patch > with "let's rather use -d for '--decorate=short', or '--date=relative'", > or something like that, but you don't, leaving me uncertain about your > actual worries and intentions. Oh, I would be very much more sympathetic if somebody wanted to make a short-and-sweet single-letter option to stand for "--first-parent -p", if they come with the "first-parent chain is special---it is the trunk history of the development" world view. And the resulting behaviour would be "give me the diffs" in their world view, so I would understand if they wanted to use "-d" for such an operation. However, to folks who do not subscribe to "the first parent chain is the trunk history" world view, "give me the diffs" is not an explanation of the resulting behaviour, because in "-d" there is no trace of hint that it is also about first-parent traversal. So "-d" may not be a perfect fit for it, either. But at least it is based on a more consistent world view, I would think, than "--diff-merges=1 -p", whose behaviour becomes unexplainable when it hits "reverse" merges in a world where the first parent chain is not necessarily the trunk. Anyway, I've tentatively queued the "--dd" round. Naming is hard, I cannot tell what "dd" stards for, and I suspect no user can X-<. Thanks.