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

Re: [PATCH v4] revision: add separate field for "-m" of "diff-index -m"

From
Sergey Organov <sorganov@gmail.com>
Date
Aug 31, 2020, 21:01 UTC
Message-ID
<878sdulecd.fsf@osv.gnss.ru>
In-Reply-To
<xmqqzh6aeedr.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 15 quoted lines
> Sergey Organov <sorganov@gmail.com> writes:
>
>> Add separate 'match_missing' field for diff-index to use and set it when we
>> encounter "-m" option. This field won't then be cleared when another
>> meaning of
>> "-m" is reverted (e.g., by "--no-diff-merges"), nor it will be affected by
>> future option(s) that might drive 'ignore_merges' field.
>>
>> Use this new field from diff-lib:do_oneway_diff() instead of reusing
>> 'ignore_merges' field.
>>
>> Signed-off-by: Sergey Organov <sorganov@gmail.com>
>> ---
>
> Looks good.  Will queue.  Thanks.
Nice! Thanks a lot!
Previous: Junio C HamanoNext: Junio C Hamano
Message 11 of 12 in “revision: add separate field for "-m" of "diff-index -m"”
  1. revision: add separate field for "-m" of "diff-index -m"Sergey Organov, Aug 29, 2020
  2. revision: add separate field for "-m" of "diff-index -m"Sergey Organov, Aug 29, 2020
  3. Junio C HamanoAug 31, 2020
  4. Sergey OrganovAug 31, 2020
  5. Junio C HamanoAug 31, 2020
  6. revision: add separate field for "-m" of "diff-index -m"Sergey Organov, Aug 31, 2020
  7. Junio C HamanoAug 31, 2020
  8. Sergey OrganovAug 31, 2020
  9. revision: add separate field for "-m" of "diff-index -m"Sergey Organov, Aug 31, 2020
  10. Junio C HamanoAug 31, 2020
  11. Sergey OrganovAug 31, 2020
  12. revision: wording tweak in comment for parsing "-m"Junio C Hamano, Oct 23, 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.