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

Re: [PATCH 4/5] Add tests for git-log --merges=show|hide|only

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Mar 22, 2015, 22:40 UTC
Message-ID
<CAPig+cT-EJMBZN72N=DREZjn=c1rxgMsnJ=HNS4R3sGTUPUu0A@mail.gmail.com>
In-Reply-To
<550F3D3B.7080104@posteo.de>
On Sun, Mar 22, 2015 at 6:07 PM, Koosha Khajehmoogahi <koosha@posteo.de> wrote:
Show 24 quoted lines
> On 03/22/2015 08:57 PM, Torsten Bögershausen wrote:
>> On 22.03.15 19:28, Koosha Khajehmoogahi wrote:
>>> Signed-off-by: Koosha Khajehmoogahi <koosha@posteo.de>
>>> ---
>>> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
>>> index 5f2b290..ab6f371 100755
>>> --- a/t/t4202-log.sh
>>> +++ b/t/t4202-log.sh
>>> @@ -428,6 +428,147 @@ cat > expect <<\EOF
>>>  * initial
>>>  EOF
>>>
>>> +test_expect_success 'log with config log.merges=show' '
>>> +    git config log.merges show &&
>>> +    git log --pretty=tformat:%s >actual &&
>>> +    test_cmp both_commits_merges actual &&
>>> +    git config --unset log.merges
>> Do we need the unset here?
>> The log.merges is nicely set up before each test case, so can we drop the unset lines ?
>> (Or do I miss something ?)
>
> Good point; we can drop only those unset lines whose next test sets the log.merges.
> However, if the next test does not set it, we must unset it as it affects the
> default behavior of git-log.

Such an approach would be too fragile. Tests may be re-ordered, added, or removed. Better is to make each test as self-contained as possible. See my review[1] of this patch for alternate suggestions.

[1]: http://article.gmane.org/gmane.comp.version-control.git/266099
Previous: Koosha KhajehmoogahiNext: Koosha Khajehmoogahi
Message 10 of 20 in “Add a new option 'merges' to revision.c”
  1. 1/5 Add a new option 'merges' to revision.cKoosha Khajehmoogahi, Mar 22, 2015
  2. 2/5 Make git-log honor log.merges optionKoosha Khajehmoogahi, Mar 22, 2015
  3. Eric SunshineMar 22, 2015
  4. 3/5 Update documentations for git-log to include the new --merges option and also its corresponding config option.Koosha Khajehmoogahi, Mar 22, 2015
  5. Eric SunshineMar 22, 2015
  6. 4/5 Add tests for git-log --merges=show|hide|onlyKoosha Khajehmoogahi, Mar 22, 2015
  7. Torsten BögershausenMar 22, 2015
  8. Eric SunshineMar 22, 2015
  9. Koosha KhajehmoogahiMar 22, 2015
  10. Eric SunshineMar 22, 2015
  11. Koosha KhajehmoogahiMar 22, 2015
  12. Torsten BögershausenMar 23, 2015
  13. Eric SunshineMar 22, 2015
  14. 5/5 Update Bash completion script to include git log --merges optionKoosha Khajehmoogahi, Mar 22, 2015
  15. Eric SunshineMar 22, 2015
  16. SZEDER GáborMar 23, 2015
  17. Eric SunshineMar 22, 2015
  18. Junio C HamanoMar 22, 2015
  19. Koosha KhajehmoogahiMar 23, 2015
  20. Junio C HamanoMar 23, 2015

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.