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

Re: [PATCH 00/11] Build in merge

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 20, 2008, 03:04 UTC
Message-ID
<7v4p7oq029.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<cover.1213917600.git.vmiklos@frugalware.org>
Miklos Vajna <vmiklos@frugalware.org> writes:
Show 7 quoted lines
> Changes since the previous series I sent out to the list:
>
> - get_octopus_merge_bases() now always does a cleanup
>
> - added a new test to make sure git-merge handles more than 25 refs
>
> As usual, comments are welcome. :-)
Thanks.

I take that last line of comment to mean "this is still RFC and not for inclusion yet" ;-) I think the series is fine up to eighth patch (get octopus merge base).

I'll queue the whole thing (still strictly as "test merge" basis) to 'pu'; I've fixed 3 "old-style C function definition" issues you have in the tenth patch (build in merge), and I have some other issues with the ninth one (filter independent).

Previous: Junio C HamanoNext: Miklos Vajna
Message 22 of 23 in “Build in merge”
  1. 00/11 Build in mergeMiklos Vajna, Jun 19, 2008
  2. 01/11 Move split_cmdline() to alias.cMiklos Vajna, Jun 19, 2008
  3. 02/11 Move commit_list_count() to commit.cMiklos Vajna, Jun 19, 2008
  4. 03/11 Move parse-options's skip_prefix() to git-compat-util.hMiklos Vajna, Jun 19, 2008
  5. 04/11 Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna, Jun 19, 2008
  6. 05/11 parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION optionMiklos Vajna, Jun 19, 2008
  7. 06/11 Move read_cache_unmerged() to read-cache.cMiklos Vajna, Jun 19, 2008
  8. 07/11 git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna, Jun 19, 2008
  9. 08/11 Introduce get_octopus_merge_bases() in commit.cMiklos Vajna, Jun 19, 2008
  10. 09/11 Introduce filter_independent() in commit.cMiklos Vajna, Jun 19, 2008
  11. 10/11 Build in mergeMiklos Vajna, Jun 19, 2008
  12. 11/11 Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna, Jun 19, 2008
  13. Junio C HamanoJun 20, 2008
  14. Johannes SchindelinJun 20, 2008
  15. Miklos VajnaJun 20, 2008
  16. Johannes SchindelinJun 20, 2008
  17. Miklos VajnaJun 20, 2008
  18. Introduce filter_independent() in commit.cMiklos Vajna, Jun 21, 2008
  19. Junio C HamanoJun 21, 2008
  20. 1/2 Introduce get_merge_bases_many()Junio C Hamano, Jun 21, 2008
  21. 2/2 Introduce reduce_heads()Junio C Hamano, Jun 21, 2008
  22. Junio C HamanoJun 20, 2008
  23. Miklos VajnaJun 21, 2008

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.