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 5, 2020, 22:44 UTC
Message-ID
<87lfisk915.fsf@osv.gnss.ru>
In-Reply-To
<xmqq3650n2rc.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 23 quoted lines
> Sergey Organov <sorganov@gmail.com> writes:
>
>> Signed-off-by: Sergey Organov <sorganov@gmail.com>
>> ---
>>  t/t4013-diff-various.sh                       |  1 +
>>  ...--diff-merges=off_-p_--first-parent_master | 78 +++++++++++++++++++
>>  2 files changed, 79 insertions(+)
>>  create mode 100644
>> t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
>>
>> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
>> index 40e222c94520..86fb11cecc61 100755
>> --- a/t/t4013-diff-various.sh
>> +++ b/t/t4013-diff-various.sh
>> @@ -298,6 +298,7 @@ log --root -c --patch-with-stat --summary master
>>  # improved by Timo's patch
>>  log --root --cc --patch-with-stat --summary master
>>  log --no-diff-merges -p --first-parent master
>> +log --diff-merges=off -p --first-parent master
>
> I think we want to also test it in a different order, e.g.
>
>     log --first-parent --diff-merges=off -p master
Dunno, why original Jeff series didn't need 
     log --first-parent --no-diff-merges -p master
then?
> other than that, these three patches all look good to me.

Thanks, -- Sergey

Previous: Junio C HamanoNext: Junio C Hamano
Message 9 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.