From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [RFC/PATCH 5/9] ref-filter: implement '--merged' and '--no-merged' options Date: Mon, 08 Jun 2015 19:51:38 +0200 Message-ID: References: <5573520A.90603@gmail.com> <1433621052-5588-1-git-send-email-karthik.188@gmail.com> <1433621052-5588-5-git-send-email-karthik.188@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Cc: git@vger.kernel.org, christian.couder@gmail.com To: Karthik Nayak X-From: git-owner@vger.kernel.org Mon Jun 08 19:51:56 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Z21DC-00061R-6f for gcvg-git-2@plane.gmane.org; Mon, 08 Jun 2015 19:51:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752335AbbFHRvq (ORCPT ); Mon, 8 Jun 2015 13:51:46 -0400 Received: from mx2.imag.fr ([129.88.30.17]:56132 "EHLO rominette.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751424AbbFHRvp (ORCPT ); Mon, 8 Jun 2015 13:51:45 -0400 Received: from clopinette.imag.fr (clopinette.imag.fr [129.88.34.215]) by rominette.imag.fr (8.13.8/8.13.8) with ESMTP id t58HpZIw023242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 8 Jun 2015 19:51:35 +0200 Received: from anie.imag.fr (anie.imag.fr [129.88.7.32]) by clopinette.imag.fr (8.13.8/8.13.8) with ESMTP id t58Hpcq5010070; Mon, 8 Jun 2015 19:51:38 +0200 In-Reply-To: <1433621052-5588-5-git-send-email-karthik.188@gmail.com> (Karthik Nayak's message of "Sun, 7 Jun 2015 01:34:08 +0530") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (rominette.imag.fr [129.88.30.17]); Mon, 08 Jun 2015 19:51:35 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: t58HpZIw023242 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1434390700.23529@piAIJijGpQuXVsV+tgB/9g Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Karthik Nayak writes: > + if(filter->merge_commit) { space after if. > @@ -938,7 +991,13 @@ void ref_array_clear(struct ref_array *array) > */ > int filter_refs(int (for_each_ref_fn)(each_ref_fn, void *), struct ref_filter_cbdata *data) > { > - return for_each_ref_fn(ref_filter_handler, data); > + int ret; > + > + ret = for_each_ref_fn(ref_filter_handler, data); > + if (data->filter.merge_commit) > + do_merge_filter(data); Reading this, I first wondered why you did not do the merge_filter as part of ref_filter_handler. It seems weird to fill-in an array and then re-filter it. I think it would make sense to add a few comments, like /* Simple per-ref filtering */ ret = for_each_ref_fn(ref_filter_handler, data); /* Filters that need revision walking */ if (data->filter.merge_commit) ... -- Matthieu Moy http://www-verimag.imag.fr/~moy/