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

Re: [PATCH 09/11] Introduce filter_independent() in commit.c

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jun 20, 2008, 12:06 UTC
Message-ID
<20080620120643.GX29404@genesis.frugalware.org>
In-Reply-To
<alpine.LSU.1.00.0806201350000.32725@wbgn129.biozentrum.uni-wuerzburg.de>
On Fri, Jun 20, 2008 at 01:53:06PM +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 7 quoted lines
> > More worryingly, the flag is supposed to be cleaned from the objects 
> > after get_merge_bases() returns.  I am not sure what you'll learn by 
> > looking at the flag here.
> 
> That is a valid point, methinks.  Probably the octopus_merge_base and the 
> cleanup have to be decoupled here.  The cleanup should be nothing more 
> than calling clear_commit_marks() for every head.

Actually get_octopus_merge_bases() _needs_ to clean up the flags as it calls get_merge_bases() multiple times and get_merge_bases() expects empty flags.

> A test case would be desirable, but probably pretty complicated.  Hmm.  I 
> like tests when they are simple, because they are easy to verify by a 
> human.  Miklos, any chance for such a test case?
Sure, I'll write one.
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 15 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.