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
Torsten Bögershausen <tboegi@web.de>
Date
Mar 23, 2015, 05:14 UTC
Message-ID
<550FA130.1030402@web.de>
In-Reply-To
<550F450F.6070207@posteo.de>
Back to the original discussion:
+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

These days I would probably shorten the code, the review time and the execution time of the test and increase the clean-ness with 50% by simply writing

+test_expect_success 'log with config log.merges=show' ' + git -c log.merges=show log --pretty=tformat:%s >actual && + test_cmp both_commits_merges actual + '

Previous: Koosha KhajehmoogahiNext: Eric Sunshine
Message 12 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.