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, 20:19 UTC
Message-ID
<CAPig+cRvV2L3Wt3sMLHMngzeomLcD96Swfd3KSXJxnBEid2yVA@mail.gmail.com>
In-Reply-To
<550F1E9F.40801@web.de>
On Sun, Mar 22, 2015 at 3:57 PM, Torsten Bögershausen <tboegi@web.de> wrote:
Show 16 quoted lines
> 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
>>
>> +cat > only_merges <<EOF
>
> - please no space after the ">"
> - please add the && at the end of the line:
> cat >only_merges <<EOF &&

This code is outside any test, so && has no impact (and would be slightly confusing). Better would be to move this setup code into a "setup --merges=" test, in which case the &&-chain would be appropriate.

Previous: Torsten BögershausenNext: Koosha Khajehmoogahi
Message 8 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.