git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/3] t/t4013: add test for --diff-merges=off

From
Sergey Organov <sorganov@gmail.com>
Date
Aug 17, 2020, 20:36 UTC
Message-ID
<87wo1xko0y.fsf@osv.gnss.ru>
In-Reply-To
<xmqqr1s52nv5.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 10 quoted lines
> Sergey Organov <sorganov@gmail.com> writes:
>
>> So, do these both effectively resolve to:
>>
>>       git log -m --no-diff-merges --first-parent --patch 
>>
>> where first -m is the one implied by --first-parent, ...
>
> Eh, why does --first-parent even affect the choice of -m/no-m when
> --no-diff-merges is explicitly given?
Well, let's try your question on 3 abstract options:

"Why does --X even affects the choice of --Y/no-Y when --Z is explicitly given?"

And what is the assumed answer?

"--X should only affect the choice of --Y/no-Y when no --Z is explicitly given"

right? Or, in other terms:
"--X implies --Y unless --Z is explicitly given (as opposed to implied?)"

Do you see the problem here? I do see this as a problem. Simple "--X implies --Y" should be sufficient to achieve any of required behaviors. No need for such complications.

I just try to figure if some more or less strict model is hidden behind all this, and it seems there is none.

Thanks, -- Sergey

Previous: Junio C Hamano
Message 17 of 17 in “Change "--diff-merges" to require parameter”
  1. 0/3 Change "--diff-merges" to require parameterSergey Organov, Aug 5, 2020
  2. 2/3 doc/git-log: describe --diff-merges=offSergey Organov, Aug 5, 2020
  3. Junio C HamanoAug 12, 2020
  4. Junio C HamanoAug 12, 2020
  5. Sergey OrganovAug 12, 2020
  6. 1/3 revision: change "--diff-merges" option to require parameterSergey Organov, Aug 5, 2020
  7. 3/3 t/t4013: add test for --diff-merges=offSergey Organov, Aug 5, 2020
  8. Junio C HamanoAug 5, 2020
  9. Sergey OrganovAug 5, 2020
  10. Junio C HamanoAug 5, 2020
  11. Junio C HamanoAug 5, 2020
  12. Sergey OrganovAug 6, 2020
  13. Junio C HamanoAug 6, 2020
  14. Sergey OrganovAug 6, 2020
  15. Sergey OrganovAug 7, 2020
  16. Junio C HamanoAug 17, 2020
  17. Sergey OrganovAug 17, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.