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:28 UTC
- Message-ID
- <xmqqtwtq9xo9.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <xmqqegkubddy.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 22 quoted lines
> Karthik Nayak <karthik.188@gmail.com> writes:
>
>> +static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
>> +{
>> ...
>> + 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"));
>> + ...
>
> 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.Ah, now I see this came from a part of print_ref_list in builtin/branch.c; you would want to leave a note there.