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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 20, 2008, 03:03 UTC
Message-ID
<7vabhgq02p.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<0d95a099ad6e47c60894983ab7bfd94a3aeddce7.1213917600.git.vmiklos@frugalware.org>
Miklos Vajna <vmiklos@frugalware.org> writes:
Show 31 quoted lines
> This is similar to git-show-branch --independent: It filters out commits
> which are reachable from any other item from the input list.
>
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
> ---
>  commit.c |   16 ++++++++++++++++
>  commit.h |    1 +
>  2 files changed, 17 insertions(+), 0 deletions(-)
>
> diff --git a/commit.c b/commit.c
> index 6052ca3..0dbf4b7 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -705,3 +705,19 @@ int in_merge_bases(struct commit *commit, struct commit **reference, int num)
>  	free_commit_list(bases);
>  	return ret;
>  }
> +
> +struct commit_list *filter_independent(unsigned char *head,
> +	struct commit_list *heads)
> +{
> +	struct commit_list *i, *bases, *ret = NULL;
> +	struct commit_list **pptr = &ret;
> +
> +	commit_list_insert(lookup_commit(head), &heads);
> +
> +	bases = get_octopus_merge_bases(heads);
> +
> +	for (i = heads; i; i = i->next)
> +		if (!(i->item->object.flags & RESULT))
> +			pptr = &commit_list_insert(i->item, pptr)->next;
Hmm.  How well was this function tested?

Because RESULT is an implementation detail of merge_bases(), I do not think we would want to expose it outside of it.

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.

Previous: Miklos VajnaNext: Johannes Schindelin
Message 13 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.