Re: [PATCH v3 06/11] ref-filter: implement '--merged' and '--no-merged' options
- From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
- Date
- Jun 17, 2015, 08:38 UTC
- Message-ID
- <vpqoakezq51.fsf@anie.imag.fr>
- In-Reply-To
- <1434464457-10749-6-git-send-email-karthik.188@gmail.com>
Karthik Nayak <karthik.188@gmail.com> writes:
Show 11 quoted lines
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -901,12 +903,19 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
> if (!match_points_at(&filter->points_at, oid->hash, refname))
> return 0;
>
> + if (filter->merge_commit) {
> + commit = lookup_commit_reference_gently(oid->hash, 1);
> + if (!commit)
> + return 0;
> + }I'd appreciate a comment here. If I understand correctly, the comment could be along the lines of
/* * A merge filter implies that we're looking at refs pointing to * commits => discard non-commits early. The actual filtering is done * later. */
(perhaps something more concise)
-- Matthieu Moy http://www-verimag.imag.fr/~moy/