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

Re: [PATCH v6 06/11] ref-filter: implement '--merged' and '--no-merged' options

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 29, 2015, 18:03 UTC
Message-ID
<xmqqegkubddy.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1435222633-32007-6-git-send-email-karthik.188@gmail.com>
Karthik Nayak <karthik.188@gmail.com> writes:
Show 43 quoted lines
> +static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
> +{
> +	struct rev_info revs;
> +	int i, old_nr;
> +	struct ref_filter *filter = ref_cbdata->filter;
> +	struct ref_array *array = ref_cbdata->array;
> +	struct commit **to_clear = xcalloc(sizeof(struct commit *), array->nr);
> +
> +	init_revisions(&revs, NULL);
> +
> +	for (i = 0; i < array->nr; i++) {
> +		struct ref_array_item *item = array->items[i];
> +		add_pending_object(&revs, &item->commit->object, item->refname);
> +		to_clear[i] = item->commit;
> +	}
> +
> +	filter->merge_commit->object.flags |= UNINTERESTING;
> +	add_pending_object(&revs, &filter->merge_commit->object, "");
> +
> +	revs.limited = 1;
> +	if (prepare_revision_walk(&revs))
> +		die(_("revision walk setup failed"));
> +
> +	old_nr = array->nr;
> +	array->nr = 0;
> +
> +	for (i = 0; i < old_nr; i++) {
> +		struct ref_array_item *item = array->items[i];
> +		struct commit *commit = item->commit;
> +
> +		int is_merged = !!(commit->object.flags & UNINTERESTING);
> +
> +		if (is_merged == (filter->merge == REF_FILTER_MERGED_INCLUDE))
> +			array->items[array->nr++] = array->items[i];
> +		else
> +			free_array_item(item);
> +	}
> +
> +	for (i = 0; i < old_nr; i++)
> +		clear_commit_marks(to_clear[i], ALL_REV_FLAGS);
> +	clear_commit_marks(filter->merge_commit, ALL_REV_FLAGS);
> +	free(to_clear);
> +}

Did this come from somewhere else (e.g. tag -l or branch -l)? If so, you'd need a note similar to what you added in [02/11] to the original.

I also have a feeling that compared to an implementation based on paint_down_to_common(), including is_descendant_of(), this may be less precise (e.g. it would be confused with clock skew that lasts more than SLOP commits). If we are inventing a new helper (as opposed to moving an existing one), we'd probably be better off doing a thin wrapper around paint_down_to_common() than calling revision-walk machinery.

Previous: Karthik NayakNext: Junio C Hamano
Message 14 of 25 in “add options to for-each-ref”
  1. 00/11 add options to for-each-refKarthik Nayak, Jun 25, 2015
  2. 01/11 t6302: for-each-ref tests for ref-filter APIsKarthik Nayak, Jun 25, 2015
  3. 02/11 tag: libify parse_opt_points_at()Karthik Nayak, Jun 25, 2015
  4. 03/11 ref-filter: implement '--points-at' optionKarthik Nayak, Jun 25, 2015
  5. Junio C HamanoJun 29, 2015
  6. Karthik NayakJun 29, 2015
  7. 04/11 for-each-ref: add '--points-at' optionKarthik Nayak, Jun 25, 2015
  8. Junio C HamanoJun 29, 2015
  9. Karthik NayakJun 29, 2015
  10. Junio C HamanoJun 29, 2015
  11. Karthik NayakJun 29, 2015
  12. 05/11 ref-filter: add parse_opt_merge_filter()Karthik Nayak, Jun 25, 2015
  13. 06/11 ref-filter: implement '--merged' and '--no-merged' optionsKarthik Nayak, Jun 25, 2015
  14. Junio C HamanoJun 29, 2015
  15. Junio C HamanoJun 29, 2015
  16. Karthik NayakJun 30, 2015
  17. Junio C HamanoJun 30, 2015
  18. Karthik NayakJun 30, 2015
  19. 07/11 for-each-ref: add '--merged' and '--no-merged' optionsKarthik Nayak, Jun 25, 2015
  20. 08/11 parse-option: rename parse_opt_with_commit()Karthik Nayak, Jun 25, 2015
  21. 09/11 parse-options.h: add macros for '--contains' optionKarthik Nayak, Jun 25, 2015
  22. 10/11 ref-filter: implement '--contains' optionKarthik Nayak, Jun 25, 2015
  23. 11/11 for-each-ref: add '--contains' optionKarthik Nayak, Jun 25, 2015
  24. Junio C HamanoJun 29, 2015
  25. Karthik NayakJun 29, 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.