From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: karthik nayak <karthik.188@gmail•com>
Cc: Git <git@vger•kernel.org>,
Christian Couder <christian.couder@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH v8 0/11] Create ref-filter from for-each-ref
Date: Sun, 14 Jun 2015 10:04:02 +0200 [thread overview]
Message-ID: <vpq8ubmemx9.fsf@anie.imag.fr> (raw)
In-Reply-To: <CAOLa=ZR6hRFZjXmSPh+rUS6EROdjP8d3tgP0+Yh5VDBdngCOkA@mail.gmail.com> (karthik nayak's message of "Sun, 14 Jun 2015 01:04:22 +0530")
karthik nayak <karthik.188@gmail•com> writes:
> The previous version of the patch can be found at :
> http://thread.gmane.org/gmane.comp.version-control.git/271423
>
> Changes :
> * Removed an unnecessary commit (v7 3/12)
> * Change a comment in 01/11 (v8)
And change the order of parameters in ref_filter. More precisely the
diff with v7 is the following, and it looks good to me:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index e2f15e6..7919206 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -58,7 +58,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
memset(&array, 0, sizeof(array));
memset(&filter, 0, sizeof(filter));
filter.name_patterns = argv;
- filter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN, &filter);
+ filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
ref_array_sort(sorting, &array);
if (!maxcount || array.nr < maxcount)
diff --git a/ref-filter.c b/ref-filter.c
index 310ecd6..43502a4 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -818,10 +818,10 @@ static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom
}
/*
- * Return 1 if the refname matches with one of the patterns,
- * otherwise 0. The patterns can be literal prefix (e.g. a
- * refname "refs/heads/master" matches a pattern "refs/heads/")
- * or a wildcard (e.g. the same ref matches "refs/heads/m*",too).
+ * Return 1 if the refname matches one of the patterns, otherwise 0.
+ * A pattern can be path prefix (e.g. a refname "refs/heads/master"
+ * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref
+ * matches "refs/heads/m*",too).
*/
static int match_name_as_path(const char **pattern, const char *refname)
{
@@ -912,7 +912,7 @@ void ref_array_clear(struct ref_array *array)
* as per the given ref_filter structure and finally store the
* filtered refs in the ref_array structure.
*/
-int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter)
+int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type)
{
struct ref_filter_cbdata ref_cbdata;
diff --git a/ref-filter.h b/ref-filter.h
index 6ab2a75..6997984 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -23,7 +23,7 @@ struct atom_value {
struct ref_sorting {
struct ref_sorting *next;
- int atom; /* index into 'struct atom_value *' array */
+ int atom; /* index into used_atom array (internal) */
unsigned reverse : 1;
};
@@ -55,7 +55,7 @@ struct ref_filter_cbdata {
* as per the given ref_filter structure and finally store the
* filtered refs in the ref_array structure.
*/
-int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter);
+int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type);
/* Clear all memory allocated to ref_array */
void ref_array_clear(struct ref_array *array);
/* Parse format string and sort specifiers */
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-06-14 8:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-13 19:34 [PATCH v8 0/11] Create ref-filter from for-each-ref karthik nayak
2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 02/11] for-each-ref: clean up code Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 03/11] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 04/11] for-each-ref: introduce new structures for better organisation Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 05/11] for-each-ref: introduce 'ref_array_clear()' Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 06/11] for-each-ref: rename some functions and make them public Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 07/11] for-each-ref: rename variables called sort to sorting Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 08/11] ref-filter: add 'ref-filter.h' Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 09/11] ref-filter: move code from 'for-each-ref' Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 10/11] for-each-ref: introduce filter_refs() Karthik Nayak
2015-06-13 19:37 ` [PATCH v8 11/11] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname Karthik Nayak
2015-06-14 8:04 ` Matthieu Moy [this message]
2015-06-14 8:24 ` [PATCH v8 0/11] Create ref-filter from for-each-ref karthik nayak
2015-06-15 18:49 ` Junio C Hamano
2015-06-15 20:47 ` karthik nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpq8ubmemx9.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=karthik.188@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox