From: Sergey Organov <sorganov@gmail.com>
To: Glen Choo <chooglen@google.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: so/diff-merges-more (was Re: What's cooking in git.git (Feb 2023, #01; Thu, 2))
Date: Tue, 07 Mar 2023 13:02:27 +0300 [thread overview]
Message-ID: <878rg8j2vg.fsf@osv.gnss.ru> (raw)
In-Reply-To: <kl6lzg8pcygl.fsf@chooglen-macbookpro.roam.corp.google.com> (Glen Choo's message of "Mon, 06 Mar 2023 14:22:02 -0800")
Glen Choo <chooglen@google.com> writes:
> Sergey Organov <sorganov@gmail.com> writes:
>
>>> but I have been under the impression that the remainder were OK
>>> clean-ups. Perhaps it is mostly because I read them so long ago and
>>> forgot the details X-<.
>>
>> It's not a cleanup, it's rather adding missed feature that allows to get
>> precise '-m' behavior with --diff-merges.
>> ...
>> However, by making such decision we lost ability to provide exact
>> behavior of -m using --diff-merges= set of options. This has been
>> pointed out later to me in the list, and felt obliged to finish
>> implementation by providing the feature.
>>
>> --diff-merges=hide
>>
>> is exactly that.
>
> This is exactly the "immortaliz[ing] a mistake" that I mentioned
> upthread, by turning a UX wart (-m doesn't imply -p) that neither of us
> likes into a feature. I'd be in favor of getting rid of the wart
> altogether (i.e. let's find a path that lets us make -m imply -p in the
> future), but not rebranding it as a feature.
We are walking in rounds here. Let me try to find at least some common
ground. Could we try to agree on *one* of these 2 mutually exclusive
statements, please:
1. Current -m behavior is useful
2. Current -m behavior is useless
To me it looks like Junio thinks 1 is the case, and you, Glen, think
it's 2 that is the case, and you both somewhat oppose to my patch
series, believing you agree with each other, that in fact does not seem
to be the case from my POV, effectively leaving me no way to adopt the
series so that they are actually accepted.
Thanks,
-- Sergey Organov
next prev parent reply other threads:[~2023-03-07 10:02 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 4:02 What's cooking in git.git (Feb 2023, #01; Thu, 2) Junio C Hamano
2023-02-04 9:33 ` Sergey Organov
2023-02-06 18:35 ` Junio C Hamano
2023-02-06 21:35 ` Sergey Organov
2023-03-01 18:40 ` Sergey Organov
2023-03-01 22:15 ` Junio C Hamano
2023-03-01 22:26 ` Sergey Organov
2023-03-01 23:54 ` Glen Choo
2023-03-02 14:38 ` Sergey Organov
2023-02-07 4:06 ` so/diff-merges-more (was Re: What's cooking in git.git (Feb 2023, #01; Thu, 2)) Glen Choo
2023-02-07 12:50 ` Sergey Organov
2023-03-02 0:37 ` Glen Choo
2023-03-02 16:15 ` Junio C Hamano
2023-03-02 16:57 ` Sergey Organov
2023-03-06 22:22 ` Glen Choo
2023-03-07 10:02 ` Sergey Organov [this message]
2023-03-07 17:54 ` Junio C Hamano
2023-03-08 22:19 ` Sergey Organov
2023-03-08 23:08 ` Junio C Hamano
2023-03-09 13:54 ` Sergey Organov
2023-03-09 17:43 ` Glen Choo
2023-03-09 19:56 ` Sergey Organov
2023-03-10 21:19 ` Glen Choo
2023-03-10 21:47 ` Junio C Hamano
2023-03-17 14:18 ` Sergey Organov
2023-03-18 0:08 ` Junio C Hamano
2023-03-25 16:55 ` Sergey Organov
2023-03-29 7:43 ` Sergey Organov
2023-03-29 8:06 ` Sergey Organov
2023-02-08 17:22 ` ds/bundle-uri-5 (was: " Victoria Dye
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878rg8j2vg.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).