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

Re: What's cooking in git.git (Oct 2023, #01; Mon, 2)

From
Sergey Organov <sorganov@gmail.com>
Date
Oct 6, 2023, 18:02 UTC
Message-ID
<87il7jr5mn.fsf@osv.gnss.ru>
In-Reply-To
<xmqqh6n4eo7n.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 27 quoted lines
> Sergey Organov <sorganov@gmail.com> 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, it stands for diff-diff (for both merges and regulars), and got inspired by --cc as well. Also selected as being fairly easy to type.

Should I add this to the commit message?
-- Sergey Organov
Previous: Junio C HamanoNext: Eric W. Biederman
Message 10 of 12 in “What's cooking in git.git (Oct 2023, #01; Mon, 2)”
  1. Junio C HamanoOct 3, 2023
  2. Sergey OrganovOct 3, 2023
  3. Junio C HamanoOct 3, 2023
  4. Sergey OrganovOct 3, 2023
  5. Junio C HamanoOct 4, 2023
  6. Sergey OrganovOct 4, 2023
  7. Junio C HamanoOct 5, 2023
  8. Sergey OrganovOct 5, 2023
  9. Junio C HamanoOct 5, 2023
  10. Sergey OrganovOct 6, 2023
  11. Eric W. BiedermanOct 4, 2023
  12. Junio C HamanoOct 4, 2023

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.