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

Re: [PATCH 6/9] t4013: add tests for log.diffMerges config

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 7, 2021, 23:35 UTC
Message-ID
<xmqqh7khwtw5.fsf@gitster.g>
In-Reply-To
<87v98xitjh.fsf@evledraar.gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 8 quoted lines
>> +test_expect_success 'deny wrong log.diffMerges config' '
>> +	git config log.diffMerges wrong-value &&
>> +	test_expect_code 128 git log &&
>> +	git config --unset log.diffMerges
>
> Don't use "git config", but "test_config" at the start, then you don't
> need the --unset at the end, it'll happen automatically. Ditto for the
> following tests.

More importantly, test_config arranges the unset to happen even if a step in the middle (e.g. test_expect_code in the above example) fails. In the posted version, the control would not reach the "git config --unset" and leaves the configuration behind.

And that is the biggest reason why the above should use test_config.
Thanks for a good suggestion.
Previous: Ævar Arnfjörð BjarmasonNext: Sergey Organov
Message 17 of 47 in “git log: configurable default format for merge diffs”
  1. 0/9 git log: configurable default format for merge diffsSergey Organov, Apr 7, 2021
  2. 1/9 diff-merges: introduce --diff-merges=defSergey Organov, Apr 7, 2021
  3. Philip OakleyApr 8, 2021
  4. Sergey OrganovApr 8, 2021
  5. Junio C HamanoApr 8, 2021
  6. Sergey OrganovApr 8, 2021
  7. 2/9 diff-merges: refactor set_diff_merges()Sergey Organov, Apr 7, 2021
  8. 3/9 diff-merges: introduce log.diffMerges config variableSergey Organov, Apr 7, 2021
  9. SZEDER GáborApr 8, 2021
  10. SZEDER GáborApr 8, 2021
  11. Junio C HamanoApr 8, 2021
  12. Sergey OrganovApr 8, 2021
  13. 4/9 diff-merges: adapt -m to enable default diff formatSergey Organov, Apr 7, 2021
  14. 5/9 t4013: add test for --diff-merges=defSergey Organov, Apr 7, 2021
  15. 6/9 t4013: add tests for log.diffMerges configSergey Organov, Apr 7, 2021
  16. Ævar Arnfjörð BjarmasonApr 7, 2021
  17. Junio C HamanoApr 7, 2021
  18. Sergey OrganovApr 8, 2021
  19. 7/9 t9902: fix completion tests for log.d* to match log.diffMergesSergey Organov, Apr 7, 2021
  20. Ævar Arnfjörð BjarmasonApr 7, 2021
  21. Sergey OrganovApr 8, 2021
  22. Ævar Arnfjörð BjarmasonApr 8, 2021
  23. Sergey OrganovApr 8, 2021
  24. SZEDER GáborApr 8, 2021
  25. Sergey OrganovApr 8, 2021
  26. 8/9 doc/diff-options: document new --diff-merges featuresSergey Organov, Apr 7, 2021
  27. 9/9 doc/config: document log.diffMergesSergey Organov, Apr 7, 2021
  28. 0/5 git log: configurable default format for merge diffsSergey Organov, Apr 10, 2021
  29. 1/5 diff-merges: introduce --diff-merges=defaultSergey Organov, Apr 10, 2021
  30. 2/5 diff-merges: refactor set_diff_merges()Sergey Organov, Apr 10, 2021
  31. 3/5 diff-merges: adapt -m to enable default diff formatSergey Organov, Apr 10, 2021
  32. 4/5 diff-merges: introduce log.diffMerges config variableSergey Organov, Apr 10, 2021
  33. 5/5 doc/diff-options: document new --diff-merges featuresSergey Organov, Apr 10, 2021
  34. Junio C HamanoApr 11, 2021
  35. Sergey OrganovApr 11, 2021
  36. Junio C HamanoApr 11, 2021
  37. Sergey OrganovApr 11, 2021
  38. Sergey OrganovApr 11, 2021
  39. 0/5 git log: configurable default format for merge diffsSergey Organov, Apr 13, 2021
  40. 1/5 diff-merges: introduce --diff-merges=onSergey Organov, Apr 13, 2021
  41. Junio C HamanoApr 13, 2021
  42. 2/5 diff-merges: refactor set_diff_merges()Sergey Organov, Apr 13, 2021
  43. 3/5 diff-merges: adapt -m to enable default diff formatSergey Organov, Apr 13, 2021
  44. 4/5 diff-merges: introduce log.diffMerges config variableSergey Organov, Apr 13, 2021
  45. Junio C HamanoApr 15, 2021
  46. Sergey OrganovApr 16, 2021
  47. 5/5 doc/diff-options: document new --diff-merges featuresSergey Organov, Apr 13, 2021

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.