{"thread":{"id":"39541","subject":"[WIP/PATCH v5 01/10] for-each-ref: extract helper functions out of grab_single_ref()","startedAt":"2015-06-06T07:04:24Z","lastAt":"2015-06-09T06:31:15Z","messageCount":27,"participants":["Karthik Nayak","Christian Couder","Matthieu Moy","Junio C Hamano"],"isPatch":true,"patchVersion":5,"patchTotal":10},"messages":[{"id":"263083","messageId":"55729B78.1070207@gmail.com","threadId":"39541","inReplyTo":null,"subject":"[WIP/PATCH v5 0/10] create ref-filter from for-each-ref","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:04:24Z","receivedAt":"2015-06-06T07:04:24Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Version for of this patch can be found here :\nhttp://www.mail-archive.com/git@vger.kernel.org/msg70280.html\n\nChanges in this version:\n*\tRename functions to better suit the code.\n*\timplement filter_refs()\n*\tuse FLEX_ARRAY for refname\n*\tother small changes\n-- \nRegards,\nKarthik\n"},{"id":"263081","messageId":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"55729B78.1070207@gmail.com","subject":"[WIP/PATCH v5 01/10] for-each-ref: extract helper functions out of grab_single_ref()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:32Z","receivedAt":"2015-06-06T07:09:32Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Extract two helper functions out of grab_single_ref(). Firstly,\nnew_refinfo() which is used to allocate memory for a new refinfo\nstructure and copy the objectname, refname and flag to it.\nSecondly, match_name_as_path() which when given an array of patterns\nand the refname checks if the refname matches any of the patterns\ngiven while the pattern is a pathname, also while supporting wild\ncharacters.\n\nThis is a preperatory patch for restructuring 'for-each-ref' and\neventually moving most of it to 'ref-filter' to provide the\nfunctionality to similar commands via public API's.\n\nHelped-by: Junio C Hamano \nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 63 ++++++++++++++++++++++++++++++++------------------\n 1 file changed, 40 insertions(+), 23 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 83f9cf9..48da5a4 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -837,6 +837,43 @@ struct grab_ref_cbdata {\n };\n \n /*\n+ * Given a refname, return 1 if the refname matches with one of the patterns\n+ * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n+ * and so on, else return 0. Supports use of wild characters.\n+ */\n+static int match_name_as_path(const char **pattern, const char *refname)\n+{\n+\tint namelen = strlen(refname);\n+\tfor (; *pattern; pattern++) {\n+\t\tconst char *p = *pattern;\n+\t\tint plen = strlen(p);\n+\n+\t\tif ((plen <= namelen) &&\n+\t\t !strncmp(refname, p, plen) &&\n+\t\t (refname[plen] == '\\0' ||\n+\t\t refname[plen] == '/' ||\n+\t\t p[plen-1] == '/'))\n+\t\t\treturn 1;\n+\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n+\t\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n+/* Allocate space for a new refinfo and copy the objectname and flag to it */\n+static struct refinfo *new_refinfo(const char *refname,\n+\t\t\t\t const unsigned char *objectname,\n+\t\t\t\t int flag)\n+{\n+\tstruct refinfo *ref = xcalloc(1, sizeof(struct refinfo));\n+\tref->refname = xstrdup(refname);\n+\thashcpy(ref->objectname, objectname);\n+\tref->flag = flag;\n+\n+\treturn ref;\n+}\n+\n+/*\n * A call-back given to for_each_ref(). Filter refs and keep them for\n * later object processing.\n */\n@@ -851,35 +888,15 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n \t\t return 0;\n \t}\n \n-\tif (*cb->grab_pattern) {\n-\t\tconst char **pattern;\n-\t\tint namelen = strlen(refname);\n-\t\tfor (pattern = cb->grab_pattern; *pattern; pattern++) {\n-\t\t\tconst char *p = *pattern;\n-\t\t\tint plen = strlen(p);\n-\n-\t\t\tif ((plen <= namelen) &&\n-\t\t\t !strncmp(refname, p, plen) &&\n-\t\t\t (refname[plen] == '\\0' ||\n-\t\t\t refname[plen] == '/' ||\n-\t\t\t p[plen-1] == '/'))\n-\t\t\t\tbreak;\n-\t\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n-\t\t\t\tbreak;\n-\t\t}\n-\t\tif (!*pattern)\n-\t\t\treturn 0;\n-\t}\n+\tif (*cb->grab_pattern && !match_name_as_path(cb->grab_pattern, refname))\n+\t\treturn 0;\n \n \t/*\n \t * We do not open the object yet; sort may only need refname\n \t * to do its job and the resulting list may yet to be pruned\n \t * by maxcount logic.\n \t */\n-\tref = xcalloc(1, sizeof(*ref));\n-\tref->refname = xstrdup(refname);\n-\thashcpy(ref->objectname, sha1);\n-\tref->flag = flag;\n+\tref = new_refinfo(refname, sha1, flag);\n \n \tcnt = cb->grab_cnt;\n \tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n-- \n2.4.2\n"},{"id":"263086","messageId":"1433574581-23980-2-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 02/10] for-each-ref: clean up code","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:33Z","receivedAt":"2015-06-06T07:09:33Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"In 'grab_single_ref()' remove the extra count variable 'cnt' and\nuse the variable 'grab_cnt' of structure 'grab_ref_cbdata' directly\ninstead.\n\nChange comment in 'struct ref_sort' to reflect changes in code.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 9 +++------\n 1 file changed, 3 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 48da5a4..0ca9836 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -27,7 +27,7 @@ struct atom_value {\n \n struct ref_sort {\n \tstruct ref_sort *next;\n-\tint atom; /* index into used_atom array */\n+\tint atom; /* index into 'struct atom_value *' array */\n \tunsigned reverse : 1;\n };\n \n@@ -881,7 +881,6 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n {\n \tstruct grab_ref_cbdata *cb = cb_data;\n \tstruct refinfo *ref;\n-\tint cnt;\n \n \tif (flag & REF_BAD_NAME) {\n \t\t warning(\"ignoring ref with broken name %s\", refname);\n@@ -898,10 +897,8 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n \t */\n \tref = new_refinfo(refname, sha1, flag);\n \n-\tcnt = cb->grab_cnt;\n-\tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n-\tcb->grab_array[cnt++] = ref;\n-\tcb->grab_cnt = cnt;\n+\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n+\tcb->grab_array[cb->grab_cnt++] = ref;\n \treturn 0;\n }\n \n-- \n2.4.2\n"},{"id":"263084","messageId":"1433574581-23980-3-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 03/10] for-each-ref: rename 'refinfo' to 'ref_array_item'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:34Z","receivedAt":"2015-06-06T07:09:34Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Rename 'refinfo' to 'ref_array_item' as a preparatory step for\nintroduction of new structures in the forthcoming patch.\n\nRe-order the fields in 'ref_array_item' so that refname can be\neventually converted to a FLEX_ARRAY.\n\nMake 'symref' a non const char pointer, so that the compiler doesn't\nthrow an error when we try to free the memory allocated to it.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 42 +++++++++++++++++++++---------------------\n 1 file changed, 21 insertions(+), 21 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 0ca9836..b8d17b6 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -31,12 +31,12 @@ struct ref_sort {\n \tunsigned reverse : 1;\n };\n \n-struct refinfo {\n-\tchar *refname;\n+struct ref_array_item {\n \tunsigned char objectname[20];\n \tint flag;\n-\tconst char *symref;\n+\tchar *symref;\n \tstruct atom_value *value;\n+\tchar *refname;\n };\n \n static struct {\n@@ -85,7 +85,7 @@ static struct {\n * a \"*\" to denote deref_tag().\n *\n * We parse given format string and sort specifiers, and make a list\n- * of properties that we need to extract out of objects. refinfo\n+ * of properties that we need to extract out of objects. ref_array_item\n * structure will hold an array of values extracted that can be\n * indexed with the \"atom number\", which is an index into this\n * array.\n@@ -622,7 +622,7 @@ static inline char *copy_advance(char *dst, const char *src)\n /*\n * Parse the object referred by ref, and grab needed value.\n */\n-static void populate_value(struct refinfo *ref)\n+static void populate_value(struct ref_array_item *ref)\n {\n \tvoid *buf;\n \tstruct object *obj;\n@@ -821,7 +821,7 @@ static void populate_value(struct refinfo *ref)\n * Given a ref, return the value for the atom. This lazily gets value\n * out of the object by calling populate value.\n */\n-static void get_value(struct refinfo *ref, int atom, struct atom_value **v)\n+static void get_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n {\n \tif (!ref->value) {\n \t\tpopulate_value(ref);\n@@ -831,7 +831,7 @@ static void get_value(struct refinfo *ref, int atom, struct atom_value **v)\n }\n \n struct grab_ref_cbdata {\n-\tstruct refinfo **grab_array;\n+\tstruct ref_array_item **grab_array;\n \tconst char **grab_pattern;\n \tint grab_cnt;\n };\n@@ -860,12 +860,12 @@ static int match_name_as_path(const char **pattern, const char *refname)\n \treturn 0;\n }\n \n-/* Allocate space for a new refinfo and copy the objectname and flag to it */\n-static struct refinfo *new_refinfo(const char *refname,\n-\t\t\t\t const unsigned char *objectname,\n-\t\t\t\t int flag)\n+/* Allocate space for a new ref_array_item and copy the objectname and flag to it */\n+static struct ref_array_item *new_ref_array_item(const char *refname,\n+\t\t\t\t\t\t const unsigned char *objectname,\n+\t\t\t\t\t\t int flag)\n {\n-\tstruct refinfo *ref = xcalloc(1, sizeof(struct refinfo));\n+\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));\n \tref->refname = xstrdup(refname);\n \thashcpy(ref->objectname, objectname);\n \tref->flag = flag;\n@@ -880,7 +880,7 @@ static struct refinfo *new_refinfo(const char *refname,\n static int grab_single_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n {\n \tstruct grab_ref_cbdata *cb = cb_data;\n-\tstruct refinfo *ref;\n+\tstruct ref_array_item *ref;\n \n \tif (flag & REF_BAD_NAME) {\n \t\t warning(\"ignoring ref with broken name %s\", refname);\n@@ -895,14 +895,14 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n \t * to do its job and the resulting list may yet to be pruned\n \t * by maxcount logic.\n \t */\n-\tref = new_refinfo(refname, sha1, flag);\n+\tref = new_ref_array_item(refname, sha1, flag);\n \n \tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n \tcb->grab_array[cb->grab_cnt++] = ref;\n \treturn 0;\n }\n \n-static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b)\n+static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b)\n {\n \tstruct atom_value *va, *vb;\n \tint cmp;\n@@ -929,8 +929,8 @@ static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b\n static struct ref_sort *ref_sort;\n static int compare_refs(const void *a_, const void *b_)\n {\n-\tstruct refinfo *a = *((struct refinfo **)a_);\n-\tstruct refinfo *b = *((struct refinfo **)b_);\n+\tstruct ref_array_item *a = *((struct ref_array_item **)a_);\n+\tstruct ref_array_item *b = *((struct ref_array_item **)b_);\n \tstruct ref_sort *s;\n \n \tfor (s = ref_sort; s; s = s->next) {\n@@ -941,10 +941,10 @@ static int compare_refs(const void *a_, const void *b_)\n \treturn 0;\n }\n \n-static void sort_refs(struct ref_sort *sort, struct refinfo **refs, int num_refs)\n+static void sort_refs(struct ref_sort *sort, struct ref_array_item **refs, int num_refs)\n {\n \tref_sort = sort;\n-\tqsort(refs, num_refs, sizeof(struct refinfo *), compare_refs);\n+\tqsort(refs, num_refs, sizeof(struct ref_array_item *), compare_refs);\n }\n \n static void print_value(struct atom_value *v, int quote_style)\n@@ -1011,7 +1011,7 @@ static void emit(const char *cp, const char *ep)\n \t}\n }\n \n-static void show_ref(struct refinfo *info, const char *format, int quote_style)\n+static void show_ref(struct ref_array_item *info, const char *format, int quote_style)\n {\n \tconst char *cp, *sp, *ep;\n \n@@ -1084,7 +1084,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n \tstruct ref_sort *sort = NULL, **sort_tail = &sort;\n \tint maxcount = 0, quote_style = 0;\n-\tstruct refinfo **refs;\n+\tstruct ref_array_item **refs;\n \tstruct grab_ref_cbdata cbdata;\n \n \tstruct option opts[] = {\n-- \n2.4.2\n"},{"id":"263082","messageId":"1433574581-23980-4-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 04/10] for-each-ref: introduce new structures for better organisation","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:35Z","receivedAt":"2015-06-06T07:09:35Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Introduce 'ref_filter_cbdata' which will hold 'ref_filter'\n(conditions to filter the refs on) and 'ref_array' (the array\nof ref_array_items). Modify the code to use these new structures.\n\nThis is a preparatory patch to eventually move code from 'for-each-ref'\nto 'ref-filter' and make it publicly available.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 54 ++++++++++++++++++++++++++++----------------------\n 1 file changed, 30 insertions(+), 24 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex b8d17b6..169ccc8 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -39,6 +39,20 @@ struct ref_array_item {\n \tchar *refname;\n };\n \n+struct ref_array {\n+\tint nr, alloc;\n+\tstruct ref_array_item **items;\n+};\n+\n+struct ref_filter {\n+\tconst char **name_patterns;\n+};\n+\n+struct ref_filter_cbdata {\n+\tstruct ref_array array;\n+\tstruct ref_filter filter;\n+};\n+\n static struct {\n \tconst char *name;\n \tcmp_type cmp_type;\n@@ -830,12 +844,6 @@ static void get_value(struct ref_array_item *ref, int atom, struct atom_value **\n \t*v = &ref->value[atom];\n }\n \n-struct grab_ref_cbdata {\n-\tstruct ref_array_item **grab_array;\n-\tconst char **grab_pattern;\n-\tint grab_cnt;\n-};\n-\n /*\n * Given a refname, return 1 if the refname matches with one of the patterns\n * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n@@ -879,7 +887,8 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\n */\n static int grab_single_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n {\n-\tstruct grab_ref_cbdata *cb = cb_data;\n+\tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n+\tstruct ref_filter *filter = &ref_cbdata->filter;\n \tstruct ref_array_item *ref;\n \n \tif (flag & REF_BAD_NAME) {\n@@ -887,7 +896,7 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n \t\t return 0;\n \t}\n \n-\tif (*cb->grab_pattern && !match_name_as_path(cb->grab_pattern, refname))\n+\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))\n \t\treturn 0;\n \n \t/*\n@@ -897,8 +906,8 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n \t */\n \tref = new_ref_array_item(refname, sha1, flag);\n \n-\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n-\tcb->grab_array[cb->grab_cnt++] = ref;\n+\tREALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1);\n+\tref_cbdata->array.items[ref_cbdata->array.nr++] = ref;\n \treturn 0;\n }\n \n@@ -941,10 +950,10 @@ static int compare_refs(const void *a_, const void *b_)\n \treturn 0;\n }\n \n-static void sort_refs(struct ref_sort *sort, struct ref_array_item **refs, int num_refs)\n+static void sort_refs(struct ref_sort *sort, struct ref_array *array)\n {\n \tref_sort = sort;\n-\tqsort(refs, num_refs, sizeof(struct ref_array_item *), compare_refs);\n+\tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n }\n \n static void print_value(struct atom_value *v, int quote_style)\n@@ -1080,12 +1089,11 @@ static char const * const for_each_ref_usage[] = {\n \n int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n {\n-\tint i, num_refs;\n+\tint i;\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n \tstruct ref_sort *sort = NULL, **sort_tail = &sort;\n \tint maxcount = 0, quote_style = 0;\n-\tstruct ref_array_item **refs;\n-\tstruct grab_ref_cbdata cbdata;\n+\tstruct ref_filter_cbdata ref_cbdata;\n \n \tstruct option opts[] = {\n \t\tOPT_BIT('s', \"shell\", "e_style,\n@@ -1123,17 +1131,15 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t/* for warn_ambiguous_refs */\n \tgit_config(git_default_config, NULL);\n \n-\tmemset(&cbdata, 0, sizeof(cbdata));\n-\tcbdata.grab_pattern = argv;\n-\tfor_each_rawref(grab_single_ref, &cbdata);\n-\trefs = cbdata.grab_array;\n-\tnum_refs = cbdata.grab_cnt;\n+\tmemset(&ref_cbdata, 0, sizeof(ref_cbdata));\n+\tref_cbdata.filter.name_patterns = argv;\n+\tfor_each_rawref(grab_single_ref, &ref_cbdata);\n \n-\tsort_refs(sort, refs, num_refs);\n+\tsort_refs(sort, &ref_cbdata.array);\n \n-\tif (!maxcount || num_refs < maxcount)\n-\t\tmaxcount = num_refs;\n+\tif (!maxcount || ref_cbdata.array.nr < maxcount)\n+\t\tmaxcount = ref_cbdata.array.nr;\n \tfor (i = 0; i < maxcount; i++)\n-\t\tshow_ref(refs[i], format, quote_style);\n+\t\tshow_ref(ref_cbdata.array.items[i], format, quote_style);\n \treturn 0;\n }\n-- \n2.4.2\n"},{"id":"263085","messageId":"1433574581-23980-5-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:36Z","receivedAt":"2015-06-06T07:09:36Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Introduce and implement 'ref_array_clear()' which will free\nall allocated memory for 'ref_array'.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 21 +++++++++++++++++++++\n 1 file changed, 21 insertions(+)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 169ccc8..54f03c9 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -911,6 +911,26 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n \treturn 0;\n }\n \n+/* Free memory allocated for a ref_array_item */\n+static void free_array_item(struct ref_array_item *item)\n+{\n+\tfree(item->symref);\n+\tfree(item->refname);\n+\tfree(item);\n+}\n+\n+/* Free all memory allocated for ref_array */\n+void ref_array_clear(struct ref_array *array)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < array->nr; i++)\n+\t\tfree_array_item(array->items[i]);\n+\tfree(array->items);\n+\tarray->items = NULL;\n+\tarray->nr = array->alloc = 0;\n+}\n+\n static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b)\n {\n \tstruct atom_value *va, *vb;\n@@ -1141,5 +1161,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\tmaxcount = ref_cbdata.array.nr;\n \tfor (i = 0; i < maxcount; i++)\n \t\tshow_ref(ref_cbdata.array.items[i], format, quote_style);\n+\tref_array_clear(&ref_cbdata.array);\n \treturn 0;\n }\n-- \n2.4.2\n"},{"id":"263088","messageId":"1433574581-23980-6-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 06/10] for-each-ref: rename some functions and make them public","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:37Z","receivedAt":"2015-06-06T07:09:37Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Rename some of the functions and make them publicly available.\nThis is a preparatory step for moving code from 'for-each-ref'\nto 'ref-filter' to make meaningful, targeted services available to\nother commands via public APIs.\n\nFunctions renamed are:\nparse_atom()\t\t-> \tparse_ref_filter_atom()\nverify_format()\t\t-> \tverify_ref_format()\nget_value()\t\t-> \tget_ref_atom_value()\ngrab_single_ref()\t-> \tref_filter_handler()\nsort_ref()\t\t->\tref_array_sort()\nshow_ref()\t\t->\tshow_ref_array_item()\ndefault_sort()\t\t->\tref_default_sorting()\nopt_parse_sort()\t->\tparse_opt_ref_sorting()\ncmp_ref_sort()\t\t->\tcmp_ref_sorting()\n\nRename 'struct ref_sort' to 'struct ref_sorting' in this context.\n\nBased-on-patch-by: Jeff King \nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 67 +++++++++++++++++++++++++-------------------------\n 1 file changed, 34 insertions(+), 33 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 54f03c9..f6403be 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -25,8 +25,8 @@ struct atom_value {\n \tunsigned long ul; /* used for sorting when not FIELD_STR */\n };\n \n-struct ref_sort {\n-\tstruct ref_sort *next;\n+struct ref_sorting {\n+\tstruct ref_sorting *next;\n \tint atom; /* index into 'struct atom_value *' array */\n \tunsigned reverse : 1;\n };\n@@ -112,7 +112,7 @@ static int need_color_reset_at_eol;\n /*\n * Used to parse format string and sort specifiers\n */\n-static int parse_atom(const char *atom, const char *ep)\n+int parse_ref_filter_atom(const char *atom, const char *ep)\n {\n \tconst char *sp;\n \tint i, at;\n@@ -189,7 +189,7 @@ static const char *find_next(const char *cp)\n * Make sure the format string is well formed, and parse out\n * the used atoms.\n */\n-static int verify_format(const char *format)\n+int verify_ref_format(const char *format)\n {\n \tconst char *cp, *sp;\n \n@@ -201,7 +201,7 @@ static int verify_format(const char *format)\n \t\tif (!ep)\n \t\t\treturn error(\"malformed format string %s\", sp);\n \t\t/* sp points at \"%(\" and ep points at the closing \")\" */\n-\t\tat = parse_atom(sp + 2, ep);\n+\t\tat = parse_ref_filter_atom(sp + 2, ep);\n \t\tcp = ep + 1;\n \n \t\tif (skip_prefix(used_atom[at], \"color:\", &color))\n@@ -408,7 +408,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam\n \t/*\n \t * We got here because atomname ends in \"date\" or \"date\";\n \t * it's not possible that is not \":\" because\n-\t * parse_atom() wouldn't have allowed it, so we can assume that no\n+\t * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no\n \t * \":\" means no format is specified, and use the default.\n \t */\n \tformatp = strchr(atomname, ':');\n@@ -835,7 +835,7 @@ static void populate_value(struct ref_array_item *ref)\n * Given a ref, return the value for the atom. This lazily gets value\n * out of the object by calling populate value.\n */\n-static void get_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n+static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n {\n \tif (!ref->value) {\n \t\tpopulate_value(ref);\n@@ -885,7 +885,7 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\n * A call-back given to for_each_ref(). Filter refs and keep them for\n * later object processing.\n */\n-static int grab_single_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n+int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n {\n \tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n \tstruct ref_filter *filter = &ref_cbdata->filter;\n@@ -931,14 +931,14 @@ void ref_array_clear(struct ref_array *array)\n \tarray->nr = array->alloc = 0;\n }\n \n-static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b)\n+static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)\n {\n \tstruct atom_value *va, *vb;\n \tint cmp;\n \tcmp_type cmp_type = used_atom_type[s->atom];\n \n-\tget_value(a, s->atom, &va);\n-\tget_value(b, s->atom, &vb);\n+\tget_ref_atom_value(a, s->atom, &va);\n+\tget_ref_atom_value(b, s->atom, &vb);\n \tswitch (cmp_type) {\n \tcase FIELD_STR:\n \t\tcmp = strcmp(va->s, vb->s);\n@@ -955,24 +955,24 @@ static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref\n \treturn (s->reverse) ? -cmp : cmp;\n }\n \n-static struct ref_sort *ref_sort;\n+static struct ref_sorting *ref_sorting;\n static int compare_refs(const void *a_, const void *b_)\n {\n \tstruct ref_array_item *a = *((struct ref_array_item **)a_);\n \tstruct ref_array_item *b = *((struct ref_array_item **)b_);\n-\tstruct ref_sort *s;\n+\tstruct ref_sorting *s;\n \n-\tfor (s = ref_sort; s; s = s->next) {\n-\t\tint cmp = cmp_ref_sort(s, a, b);\n+\tfor (s = ref_sorting; s; s = s->next) {\n+\t\tint cmp = cmp_ref_sorting(s, a, b);\n \t\tif (cmp)\n \t\t\treturn cmp;\n \t}\n \treturn 0;\n }\n \n-static void sort_refs(struct ref_sort *sort, struct ref_array *array)\n+void ref_array_sort(struct ref_sorting *sort, struct ref_array *array)\n {\n-\tref_sort = sort;\n+\tref_sorting = sort;\n \tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n }\n \n@@ -1040,7 +1040,7 @@ static void emit(const char *cp, const char *ep)\n \t}\n }\n \n-static void show_ref(struct ref_array_item *info, const char *format, int quote_style)\n+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)\n {\n \tconst char *cp, *sp, *ep;\n \n@@ -1050,7 +1050,7 @@ static void show_ref(struct ref_array_item *info, const char *format, int quote_\n \t\tep = strchr(sp, ')');\n \t\tif (cp < sp)\n \t\t\temit(cp, sp);\n-\t\tget_value(info, parse_atom(sp + 2, ep), &atomv);\n+\t\tget_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);\n \t\tprint_value(atomv, quote_style);\n \t}\n \tif (*cp) {\n@@ -1069,21 +1069,22 @@ static void show_ref(struct ref_array_item *info, const char *format, int quote_\n \tputchar('\\n');\n }\n \n-static struct ref_sort *default_sort(void)\n+/* If no sorting option is given, use refname to sort as default */\n+struct ref_sorting *ref_default_sorting(void)\n {\n \tstatic const char cstr_name[] = \"refname\";\n \n-\tstruct ref_sort *sort = xcalloc(1, sizeof(*sort));\n+\tstruct ref_sorting *sort = xcalloc(1, sizeof(*sort));\n \n \tsort->next = NULL;\n-\tsort->atom = parse_atom(cstr_name, cstr_name + strlen(cstr_name));\n+\tsort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n \treturn sort;\n }\n \n-static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n+int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n {\n-\tstruct ref_sort **sort_tail = opt->value;\n-\tstruct ref_sort *s;\n+\tstruct ref_sorting **sort_tail = opt->value;\n+\tstruct ref_sorting *s;\n \tint len;\n \n \tif (!arg) /* should --no-sort void the list ? */\n@@ -1098,7 +1099,7 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n \t\targ++;\n \t}\n \tlen = strlen(arg);\n-\ts->atom = parse_atom(arg, arg+len);\n+\ts->atom = parse_ref_filter_atom(arg, arg+len);\n \treturn 0;\n }\n \n@@ -1111,7 +1112,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n {\n \tint i;\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n-\tstruct ref_sort *sort = NULL, **sort_tail = &sort;\n+\tstruct ref_sorting *sort = NULL, **sort_tail = &sort;\n \tint maxcount = 0, quote_style = 0;\n \tstruct ref_filter_cbdata ref_cbdata;\n \n@@ -1129,7 +1130,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\tOPT_INTEGER( 0 , \"count\", &maxcount, N_(\"show only matched refs\")),\n \t\tOPT_STRING( 0 , \"format\", &format, N_(\"format\"), N_(\"format to use for the output\")),\n \t\tOPT_CALLBACK(0 , \"sort\", sort_tail, N_(\"key\"),\n-\t\t\t N_(\"field name to sort on\"), &opt_parse_sort),\n+\t\t\t N_(\"field name to sort on\"), &parse_opt_ref_sorting),\n \t\tOPT_END(),\n \t};\n \n@@ -1142,25 +1143,25 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\terror(\"more than one quoting style?\");\n \t\tusage_with_options(for_each_ref_usage, opts);\n \t}\n-\tif (verify_format(format))\n+\tif (verify_ref_format(format))\n \t\tusage_with_options(for_each_ref_usage, opts);\n \n \tif (!sort)\n-\t\tsort = default_sort();\n+\t\tsort = ref_default_sorting();\n \n \t/* for warn_ambiguous_refs */\n \tgit_config(git_default_config, NULL);\n \n \tmemset(&ref_cbdata, 0, sizeof(ref_cbdata));\n \tref_cbdata.filter.name_patterns = argv;\n-\tfor_each_rawref(grab_single_ref, &ref_cbdata);\n+\tfor_each_rawref(ref_filter_handler, &ref_cbdata);\n \n-\tsort_refs(sort, &ref_cbdata.array);\n+\tref_array_sort(sort, &ref_cbdata.array);\n \n \tif (!maxcount || ref_cbdata.array.nr < maxcount)\n \t\tmaxcount = ref_cbdata.array.nr;\n \tfor (i = 0; i < maxcount; i++)\n-\t\tshow_ref(ref_cbdata.array.items[i], format, quote_style);\n+\t\tshow_ref_array_item(ref_cbdata.array.items[i], format, quote_style);\n \tref_array_clear(&ref_cbdata.array);\n \treturn 0;\n }\n-- \n2.4.2\n"},{"id":"263087","messageId":"1433574581-23980-7-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 07/10] ref-filter: add 'ref-filter.h'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:38Z","receivedAt":"2015-06-06T07:09:38Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"This is step one of creating a common library for 'for-each-ref',\n'branch -l' and 'tag -l'. This creates a header file with the\nfunctions and data structures that ref-filter will provide.\nWe move the data structures created in for-each-ref to this header\nfile.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 41 +------------------------------\n ref-filter.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 67 insertions(+), 40 deletions(-)\n create mode 100644 ref-filter.h\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex f6403be..39f7c9a 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -10,49 +10,10 @@\n #include \"parse-options.h\"\n #include \"remote.h\"\n #include \"color.h\"\n-\n-/* Quoting styles */\n-#define QUOTE_NONE 0\n-#define QUOTE_SHELL 1\n-#define QUOTE_PERL 2\n-#define QUOTE_PYTHON 4\n-#define QUOTE_TCL 8\n+#include \"ref-filter.h\"\n \n typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;\n \n-struct atom_value {\n-\tconst char *s;\n-\tunsigned long ul; /* used for sorting when not FIELD_STR */\n-};\n-\n-struct ref_sorting {\n-\tstruct ref_sorting *next;\n-\tint atom; /* index into 'struct atom_value *' array */\n-\tunsigned reverse : 1;\n-};\n-\n-struct ref_array_item {\n-\tunsigned char objectname[20];\n-\tint flag;\n-\tchar *symref;\n-\tstruct atom_value *value;\n-\tchar *refname;\n-};\n-\n-struct ref_array {\n-\tint nr, alloc;\n-\tstruct ref_array_item **items;\n-};\n-\n-struct ref_filter {\n-\tconst char **name_patterns;\n-};\n-\n-struct ref_filter_cbdata {\n-\tstruct ref_array array;\n-\tstruct ref_filter filter;\n-};\n-\n static struct {\n \tconst char *name;\n \tcmp_type cmp_type;\ndiff --git a/ref-filter.h b/ref-filter.h\nnew file mode 100644\nindex 0000000..1432ff6\n--- /dev/null\n+++ b/ref-filter.h\n@@ -0,0 +1,66 @@\n+#ifndef REF_FILTER_H\n+#define REF_FILTER_H\n+\n+#include \"sha1-array.h\"\n+#include \"refs.h\"\n+#include \"commit.h\"\n+#include \"parse-options.h\"\n+\n+/* Quoting styles */\n+#define QUOTE_NONE 0\n+#define QUOTE_SHELL 1\n+#define QUOTE_PERL 2\n+#define QUOTE_PYTHON 4\n+#define QUOTE_TCL 8\n+\n+struct atom_value {\n+\tconst char *s;\n+\tunsigned long ul; /* used for sorting when not FIELD_STR */\n+};\n+\n+struct ref_sorting {\n+\tstruct ref_sorting *next;\n+\tint atom; /* index into 'struct atom_value *' array */\n+\tunsigned reverse : 1;\n+};\n+\n+struct ref_array_item {\n+\tunsigned char objectname[20];\n+\tint flag;\n+\tchar *symref;\n+\tstruct atom_value *value;\n+\tchar *refname;\n+};\n+\n+struct ref_array {\n+\tint nr, alloc;\n+\tstruct ref_array_item **items;\n+};\n+\n+struct ref_filter {\n+\tconst char **name_patterns;\n+};\n+\n+struct ref_filter_cbdata {\n+\tstruct ref_array array;\n+\tstruct ref_filter filter;\n+};\n+\n+/* Callback function for for_each_*ref(). This filters the refs based on the filters set */\n+int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data);\n+/* Clear all memory allocated to ref_array */\n+void ref_array_clear(struct ref_array *array);\n+/* Parse format string and sort specifiers */\n+int parse_ref_filter_atom(const char *atom, const char *ep);\n+/* Used to verify if the given format is correct and to parse out the used atoms */\n+int verify_ref_format(const char *format);\n+/* Sort the given ref_array as per the ref_sorting provided */\n+void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);\n+/* Print the ref using the given format and quote_style */\n+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style);\n+/* Callback function for parsing the sort option */\n+int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset);\n+/* Default sort option based on refname */\n+struct ref_sorting *ref_default_sorting(void);\n+\n+#endif /* REF_FILTER_H */\n-- \n2.4.2\n"},{"id":"263090","messageId":"1433574581-23980-8-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 08/10] ref-filter: move code from 'for-each-ref'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:39Z","receivedAt":"2015-06-06T07:09:39Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Move most of the code from 'for-each-ref' to 'ref-filter' to make\nit publicly available to other commands, this is to unify the code\nof 'tag -l', 'branch -l' and 'for-each-ref' so that they can share\ntheir implementations with each other.\n\nAdd 'ref-filter' to the Makefile, this completes the movement of code\nfrom 'for-each-ref' to 'ref-filter'.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n Makefile | 1 +\n builtin/for-each-ref.c | 1059 -----------------------------------------------\n ref-filter.c | 1062 ++++++++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 1063 insertions(+), 1059 deletions(-)\n create mode 100644 ref-filter.c\n\ndiff --git a/Makefile b/Makefile\nindex 54ec511..d715b66 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -762,6 +762,7 @@ LIB_OBJS += reachable.o\n LIB_OBJS += read-cache.o\n LIB_OBJS += reflog-walk.o\n LIB_OBJS += refs.o\n+LIB_OBJS += ref-filter.o\n LIB_OBJS += remote.o\n LIB_OBJS += replace_object.o\n LIB_OBJS += rerere.o\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 39f7c9a..e237194 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -2,1068 +2,9 @@\n #include \"cache.h\"\n #include \"refs.h\"\n #include \"object.h\"\n-#include \"tag.h\"\n-#include \"commit.h\"\n-#include \"tree.h\"\n-#include \"blob.h\"\n-#include \"quote.h\"\n #include \"parse-options.h\"\n-#include \"remote.h\"\n-#include \"color.h\"\n #include \"ref-filter.h\"\n \n-typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;\n-\n-static struct {\n-\tconst char *name;\n-\tcmp_type cmp_type;\n-} valid_atom[] = {\n-\t{ \"refname\" },\n-\t{ \"objecttype\" },\n-\t{ \"objectsize\", FIELD_ULONG },\n-\t{ \"objectname\" },\n-\t{ \"tree\" },\n-\t{ \"parent\" },\n-\t{ \"numparent\", FIELD_ULONG },\n-\t{ \"object\" },\n-\t{ \"type\" },\n-\t{ \"tag\" },\n-\t{ \"author\" },\n-\t{ \"authorname\" },\n-\t{ \"authoremail\" },\n-\t{ \"authordate\", FIELD_TIME },\n-\t{ \"committer\" },\n-\t{ \"committername\" },\n-\t{ \"committeremail\" },\n-\t{ \"committerdate\", FIELD_TIME },\n-\t{ \"tagger\" },\n-\t{ \"taggername\" },\n-\t{ \"taggeremail\" },\n-\t{ \"taggerdate\", FIELD_TIME },\n-\t{ \"creator\" },\n-\t{ \"creatordate\", FIELD_TIME },\n-\t{ \"subject\" },\n-\t{ \"body\" },\n-\t{ \"contents\" },\n-\t{ \"contents:subject\" },\n-\t{ \"contents:body\" },\n-\t{ \"contents:signature\" },\n-\t{ \"upstream\" },\n-\t{ \"symref\" },\n-\t{ \"flag\" },\n-\t{ \"HEAD\" },\n-\t{ \"color\" },\n-};\n-\n-/*\n- * An atom is a valid field atom listed above, possibly prefixed with\n- * a \"*\" to denote deref_tag().\n- *\n- * We parse given format string and sort specifiers, and make a list\n- * of properties that we need to extract out of objects. ref_array_item\n- * structure will hold an array of values extracted that can be\n- * indexed with the \"atom number\", which is an index into this\n- * array.\n- */\n-static const char **used_atom;\n-static cmp_type *used_atom_type;\n-static int used_atom_cnt, need_tagged, need_symref;\n-static int need_color_reset_at_eol;\n-\n-/*\n- * Used to parse format string and sort specifiers\n- */\n-int parse_ref_filter_atom(const char *atom, const char *ep)\n-{\n-\tconst char *sp;\n-\tint i, at;\n-\n-\tsp = atom;\n-\tif (*sp == '*' && sp < ep)\n-\t\tsp++; /* deref */\n-\tif (ep <= sp)\n-\t\tdie(\"malformed field name: %.*s\", (int)(ep-atom), atom);\n-\n-\t/* Do we have the atom already used elsewhere? */\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tint len = strlen(used_atom[i]);\n-\t\tif (len == ep - atom && !memcmp(used_atom[i], atom, len))\n-\t\t\treturn i;\n-\t}\n-\n-\t/* Is the atom a valid one? */\n-\tfor (i = 0; i < ARRAY_SIZE(valid_atom); i++) {\n-\t\tint len = strlen(valid_atom[i].name);\n-\t\t/*\n-\t\t * If the atom name has a colon, strip it and everything after\n-\t\t * it off - it specifies the format for this entry, and\n-\t\t * shouldn't be used for checking against the valid_atom\n-\t\t * table.\n-\t\t */\n-\t\tconst char *formatp = strchr(sp, ':');\n-\t\tif (!formatp || ep < formatp)\n-\t\t\tformatp = ep;\n-\t\tif (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len))\n-\t\t\tbreak;\n-\t}\n-\n-\tif (ARRAY_SIZE(valid_atom) <= i)\n-\t\tdie(\"unknown field name: %.*s\", (int)(ep-atom), atom);\n-\n-\t/* Add it in, including the deref prefix */\n-\tat = used_atom_cnt;\n-\tused_atom_cnt++;\n-\tREALLOC_ARRAY(used_atom, used_atom_cnt);\n-\tREALLOC_ARRAY(used_atom_type, used_atom_cnt);\n-\tused_atom[at] = xmemdupz(atom, ep - atom);\n-\tused_atom_type[at] = valid_atom[i].cmp_type;\n-\tif (*atom == '*')\n-\t\tneed_tagged = 1;\n-\tif (!strcmp(used_atom[at], \"symref\"))\n-\t\tneed_symref = 1;\n-\treturn at;\n-}\n-\n-/*\n- * In a format string, find the next occurrence of %(atom).\n- */\n-static const char *find_next(const char *cp)\n-{\n-\twhile (*cp) {\n-\t\tif (*cp == '%') {\n-\t\t\t/*\n-\t\t\t * %( is the start of an atom;\n-\t\t\t * %% is a quoted per-cent.\n-\t\t\t */\n-\t\t\tif (cp[1] == '(')\n-\t\t\t\treturn cp;\n-\t\t\telse if (cp[1] == '%')\n-\t\t\t\tcp++; /* skip over two % */\n-\t\t\t/* otherwise this is a singleton, literal % */\n-\t\t}\n-\t\tcp++;\n-\t}\n-\treturn NULL;\n-}\n-\n-/*\n- * Make sure the format string is well formed, and parse out\n- * the used atoms.\n- */\n-int verify_ref_format(const char *format)\n-{\n-\tconst char *cp, *sp;\n-\n-\tneed_color_reset_at_eol = 0;\n-\tfor (cp = format; *cp && (sp = find_next(cp)); ) {\n-\t\tconst char *color, *ep = strchr(sp, ')');\n-\t\tint at;\n-\n-\t\tif (!ep)\n-\t\t\treturn error(\"malformed format string %s\", sp);\n-\t\t/* sp points at \"%(\" and ep points at the closing \")\" */\n-\t\tat = parse_ref_filter_atom(sp + 2, ep);\n-\t\tcp = ep + 1;\n-\n-\t\tif (skip_prefix(used_atom[at], \"color:\", &color))\n-\t\t\tneed_color_reset_at_eol = !!strcmp(color, \"reset\");\n-\t}\n-\treturn 0;\n-}\n-\n-/*\n- * Given an object name, read the object data and size, and return a\n- * \"struct object\". If the object data we are returning is also borrowed\n- * by the \"struct object\" representation, set *eaten as well---it is a\n- * signal from parse_object_buffer to us not to free the buffer.\n- */\n-static void *get_obj(const unsigned char *sha1, struct object **obj, unsigned long *sz, int *eaten)\n-{\n-\tenum object_type type;\n-\tvoid *buf = read_sha1_file(sha1, &type, sz);\n-\n-\tif (buf)\n-\t\t*obj = parse_object_buffer(sha1, type, *sz, buf, eaten);\n-\telse\n-\t\t*obj = NULL;\n-\treturn buf;\n-}\n-\n-static int grab_objectname(const char *name, const unsigned char *sha1,\n-\t\t\t struct atom_value *v)\n-{\n-\tif (!strcmp(name, \"objectname\")) {\n-\t\tchar *s = xmalloc(41);\n-\t\tstrcpy(s, sha1_to_hex(sha1));\n-\t\tv->s = s;\n-\t\treturn 1;\n-\t}\n-\tif (!strcmp(name, \"objectname:short\")) {\n-\t\tv->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));\n-\t\treturn 1;\n-\t}\n-\treturn 0;\n-}\n-\n-/* See grab_values */\n-static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (!strcmp(name, \"objecttype\"))\n-\t\t\tv->s = typename(obj->type);\n-\t\telse if (!strcmp(name, \"objectsize\")) {\n-\t\t\tchar *s = xmalloc(40);\n-\t\t\tsprintf(s, \"%lu\", sz);\n-\t\t\tv->ul = sz;\n-\t\t\tv->s = s;\n-\t\t}\n-\t\telse if (deref)\n-\t\t\tgrab_objectname(name, obj->sha1, v);\n-\t}\n-}\n-\n-/* See grab_values */\n-static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tstruct tag *tag = (struct tag *) obj;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (!strcmp(name, \"tag\"))\n-\t\t\tv->s = tag->tag;\n-\t\telse if (!strcmp(name, \"type\") && tag->tagged)\n-\t\t\tv->s = typename(tag->tagged->type);\n-\t\telse if (!strcmp(name, \"object\") && tag->tagged) {\n-\t\t\tchar *s = xmalloc(41);\n-\t\t\tstrcpy(s, sha1_to_hex(tag->tagged->sha1));\n-\t\t\tv->s = s;\n-\t\t}\n-\t}\n-}\n-\n-/* See grab_values */\n-static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tstruct commit *commit = (struct commit *) obj;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (!strcmp(name, \"tree\")) {\n-\t\t\tchar *s = xmalloc(41);\n-\t\t\tstrcpy(s, sha1_to_hex(commit->tree->object.sha1));\n-\t\t\tv->s = s;\n-\t\t}\n-\t\tif (!strcmp(name, \"numparent\")) {\n-\t\t\tchar *s = xmalloc(40);\n-\t\t\tv->ul = commit_list_count(commit->parents);\n-\t\t\tsprintf(s, \"%lu\", v->ul);\n-\t\t\tv->s = s;\n-\t\t}\n-\t\telse if (!strcmp(name, \"parent\")) {\n-\t\t\tint num = commit_list_count(commit->parents);\n-\t\t\tint i;\n-\t\t\tstruct commit_list *parents;\n-\t\t\tchar *s = xmalloc(41 * num + 1);\n-\t\t\tv->s = s;\n-\t\t\tfor (i = 0, parents = commit->parents;\n-\t\t\t parents;\n-\t\t\t parents = parents->next, i = i + 41) {\n-\t\t\t\tstruct commit *parent = parents->item;\n-\t\t\t\tstrcpy(s+i, sha1_to_hex(parent->object.sha1));\n-\t\t\t\tif (parents->next)\n-\t\t\t\t\ts[i+40] = ' ';\n-\t\t\t}\n-\t\t\tif (!i)\n-\t\t\t\t*s = '\\0';\n-\t\t}\n-\t}\n-}\n-\n-static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz)\n-{\n-\tconst char *eol;\n-\twhile (*buf) {\n-\t\tif (!strncmp(buf, who, wholen) &&\n-\t\t buf[wholen] == ' ')\n-\t\t\treturn buf + wholen + 1;\n-\t\teol = strchr(buf, '\\n');\n-\t\tif (!eol)\n-\t\t\treturn \"\";\n-\t\teol++;\n-\t\tif (*eol == '\\n')\n-\t\t\treturn \"\"; /* end of header */\n-\t\tbuf = eol;\n-\t}\n-\treturn \"\";\n-}\n-\n-static const char *copy_line(const char *buf)\n-{\n-\tconst char *eol = strchrnul(buf, '\\n');\n-\treturn xmemdupz(buf, eol - buf);\n-}\n-\n-static const char *copy_name(const char *buf)\n-{\n-\tconst char *cp;\n-\tfor (cp = buf; *cp && *cp != '\\n'; cp++) {\n-\t\tif (!strncmp(cp, \" <\", 2))\n-\t\t\treturn xmemdupz(buf, cp - buf);\n-\t}\n-\treturn \"\";\n-}\n-\n-static const char *copy_email(const char *buf)\n-{\n-\tconst char *email = strchr(buf, '<');\n-\tconst char *eoemail;\n-\tif (!email)\n-\t\treturn \"\";\n-\teoemail = strchr(email, '>');\n-\tif (!eoemail)\n-\t\treturn \"\";\n-\treturn xmemdupz(email, eoemail + 1 - email);\n-}\n-\n-static char *copy_subject(const char *buf, unsigned long len)\n-{\n-\tchar *r = xmemdupz(buf, len);\n-\tint i;\n-\n-\tfor (i = 0; i < len; i++)\n-\t\tif (r[i] == '\\n')\n-\t\t\tr[i] = ' ';\n-\n-\treturn r;\n-}\n-\n-static void grab_date(const char *buf, struct atom_value *v, const char *atomname)\n-{\n-\tconst char *eoemail = strstr(buf, \"> \");\n-\tchar *zone;\n-\tunsigned long timestamp;\n-\tlong tz;\n-\tenum date_mode date_mode = DATE_NORMAL;\n-\tconst char *formatp;\n-\n-\t/*\n-\t * We got here because atomname ends in \"date\" or \"date\";\n-\t * it's not possible that is not \":\" because\n-\t * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no\n-\t * \":\" means no format is specified, and use the default.\n-\t */\n-\tformatp = strchr(atomname, ':');\n-\tif (formatp != NULL) {\n-\t\tformatp++;\n-\t\tdate_mode = parse_date_format(formatp);\n-\t}\n-\n-\tif (!eoemail)\n-\t\tgoto bad;\n-\ttimestamp = strtoul(eoemail + 2, &zone, 10);\n-\tif (timestamp == ULONG_MAX)\n-\t\tgoto bad;\n-\ttz = strtol(zone, NULL, 10);\n-\tif ((tz == LONG_MIN || tz == LONG_MAX) && errno == ERANGE)\n-\t\tgoto bad;\n-\tv->s = xstrdup(show_date(timestamp, tz, date_mode));\n-\tv->ul = timestamp;\n-\treturn;\n- bad:\n-\tv->s = \"\";\n-\tv->ul = 0;\n-}\n-\n-/* See grab_values */\n-static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tint wholen = strlen(who);\n-\tconst char *wholine = NULL;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (strncmp(who, name, wholen))\n-\t\t\tcontinue;\n-\t\tif (name[wholen] != 0 &&\n-\t\t strcmp(name + wholen, \"name\") &&\n-\t\t strcmp(name + wholen, \"email\") &&\n-\t\t !starts_with(name + wholen, \"date\"))\n-\t\t\tcontinue;\n-\t\tif (!wholine)\n-\t\t\twholine = find_wholine(who, wholen, buf, sz);\n-\t\tif (!wholine)\n-\t\t\treturn; /* no point looking for it */\n-\t\tif (name[wholen] == 0)\n-\t\t\tv->s = copy_line(wholine);\n-\t\telse if (!strcmp(name + wholen, \"name\"))\n-\t\t\tv->s = copy_name(wholine);\n-\t\telse if (!strcmp(name + wholen, \"email\"))\n-\t\t\tv->s = copy_email(wholine);\n-\t\telse if (starts_with(name + wholen, \"date\"))\n-\t\t\tgrab_date(wholine, v, name);\n-\t}\n-\n-\t/*\n-\t * For a tag or a commit object, if \"creator\" or \"creatordate\" is\n-\t * requested, do something special.\n-\t */\n-\tif (strcmp(who, \"tagger\") && strcmp(who, \"committer\"))\n-\t\treturn; /* \"author\" for commit object is not wanted */\n-\tif (!wholine)\n-\t\twholine = find_wholine(who, wholen, buf, sz);\n-\tif (!wholine)\n-\t\treturn;\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\n-\t\tif (starts_with(name, \"creatordate\"))\n-\t\t\tgrab_date(wholine, v, name);\n-\t\telse if (!strcmp(name, \"creator\"))\n-\t\t\tv->s = copy_line(wholine);\n-\t}\n-}\n-\n-static void find_subpos(const char *buf, unsigned long sz,\n-\t\t\tconst char **sub, unsigned long *sublen,\n-\t\t\tconst char **body, unsigned long *bodylen,\n-\t\t\tunsigned long *nonsiglen,\n-\t\t\tconst char **sig, unsigned long *siglen)\n-{\n-\tconst char *eol;\n-\t/* skip past header until we hit empty line */\n-\twhile (*buf && *buf != '\\n') {\n-\t\teol = strchrnul(buf, '\\n');\n-\t\tif (*eol)\n-\t\t\teol++;\n-\t\tbuf = eol;\n-\t}\n-\t/* skip any empty lines */\n-\twhile (*buf == '\\n')\n-\t\tbuf++;\n-\n-\t/* parse signature first; we might not even have a subject line */\n-\t*sig = buf + parse_signature(buf, strlen(buf));\n-\t*siglen = strlen(*sig);\n-\n-\t/* subject is first non-empty line */\n-\t*sub = buf;\n-\t/* subject goes to first empty line */\n-\twhile (buf < *sig && *buf && *buf != '\\n') {\n-\t\teol = strchrnul(buf, '\\n');\n-\t\tif (*eol)\n-\t\t\teol++;\n-\t\tbuf = eol;\n-\t}\n-\t*sublen = buf - *sub;\n-\t/* drop trailing newline, if present */\n-\tif (*sublen && (*sub)[*sublen - 1] == '\\n')\n-\t\t*sublen -= 1;\n-\n-\t/* skip any empty lines */\n-\twhile (*buf == '\\n')\n-\t\tbuf++;\n-\t*body = buf;\n-\t*bodylen = strlen(buf);\n-\t*nonsiglen = *sig - buf;\n-}\n-\n-/* See grab_values */\n-static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tconst char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;\n-\tunsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (strcmp(name, \"subject\") &&\n-\t\t strcmp(name, \"body\") &&\n-\t\t strcmp(name, \"contents\") &&\n-\t\t strcmp(name, \"contents:subject\") &&\n-\t\t strcmp(name, \"contents:body\") &&\n-\t\t strcmp(name, \"contents:signature\"))\n-\t\t\tcontinue;\n-\t\tif (!subpos)\n-\t\t\tfind_subpos(buf, sz,\n-\t\t\t\t &subpos, &sublen,\n-\t\t\t\t &bodypos, &bodylen, &nonsiglen,\n-\t\t\t\t &sigpos, &siglen);\n-\n-\t\tif (!strcmp(name, \"subject\"))\n-\t\t\tv->s = copy_subject(subpos, sublen);\n-\t\telse if (!strcmp(name, \"contents:subject\"))\n-\t\t\tv->s = copy_subject(subpos, sublen);\n-\t\telse if (!strcmp(name, \"body\"))\n-\t\t\tv->s = xmemdupz(bodypos, bodylen);\n-\t\telse if (!strcmp(name, \"contents:body\"))\n-\t\t\tv->s = xmemdupz(bodypos, nonsiglen);\n-\t\telse if (!strcmp(name, \"contents:signature\"))\n-\t\t\tv->s = xmemdupz(sigpos, siglen);\n-\t\telse if (!strcmp(name, \"contents\"))\n-\t\t\tv->s = xstrdup(subpos);\n-\t}\n-}\n-\n-/*\n- * We want to have empty print-string for field requests\n- * that do not apply (e.g. \"authordate\" for a tag object)\n- */\n-static void fill_missing_values(struct atom_value *val)\n-{\n-\tint i;\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (v->s == NULL)\n-\t\t\tv->s = \"\";\n-\t}\n-}\n-\n-/*\n- * val is a list of atom_value to hold returned values. Extract\n- * the values for atoms in used_atom array out of (obj, buf, sz).\n- * when deref is false, (obj, buf, sz) is the object that is\n- * pointed at by the ref itself; otherwise it is the object the\n- * ref (which is a tag) refers to.\n- */\n-static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tgrab_common_values(val, deref, obj, buf, sz);\n-\tswitch (obj->type) {\n-\tcase OBJ_TAG:\n-\t\tgrab_tag_values(val, deref, obj, buf, sz);\n-\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n-\t\tgrab_person(\"tagger\", val, deref, obj, buf, sz);\n-\t\tbreak;\n-\tcase OBJ_COMMIT:\n-\t\tgrab_commit_values(val, deref, obj, buf, sz);\n-\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n-\t\tgrab_person(\"author\", val, deref, obj, buf, sz);\n-\t\tgrab_person(\"committer\", val, deref, obj, buf, sz);\n-\t\tbreak;\n-\tcase OBJ_TREE:\n-\t\t/* grab_tree_values(val, deref, obj, buf, sz); */\n-\t\tbreak;\n-\tcase OBJ_BLOB:\n-\t\t/* grab_blob_values(val, deref, obj, buf, sz); */\n-\t\tbreak;\n-\tdefault:\n-\t\tdie(\"Eh? Object of type %d?\", obj->type);\n-\t}\n-}\n-\n-static inline char *copy_advance(char *dst, const char *src)\n-{\n-\twhile (*src)\n-\t\t*dst++ = *src++;\n-\treturn dst;\n-}\n-\n-/*\n- * Parse the object referred by ref, and grab needed value.\n- */\n-static void populate_value(struct ref_array_item *ref)\n-{\n-\tvoid *buf;\n-\tstruct object *obj;\n-\tint eaten, i;\n-\tunsigned long size;\n-\tconst unsigned char *tagged;\n-\n-\tref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));\n-\n-\tif (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {\n-\t\tunsigned char unused1[20];\n-\t\tref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,\n-\t\t\t\t\t unused1, NULL);\n-\t\tif (!ref->symref)\n-\t\t\tref->symref = \"\";\n-\t}\n-\n-\t/* Fill in specials first */\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &ref->value[i];\n-\t\tint deref = 0;\n-\t\tconst char *refname;\n-\t\tconst char *formatp;\n-\t\tstruct branch *branch = NULL;\n-\n-\t\tif (*name == '*') {\n-\t\t\tderef = 1;\n-\t\t\tname++;\n-\t\t}\n-\n-\t\tif (starts_with(name, \"refname\"))\n-\t\t\trefname = ref->refname;\n-\t\telse if (starts_with(name, \"symref\"))\n-\t\t\trefname = ref->symref ? ref->symref : \"\";\n-\t\telse if (starts_with(name, \"upstream\")) {\n-\t\t\t/* only local branches may have an upstream */\n-\t\t\tif (!starts_with(ref->refname, \"refs/heads/\"))\n-\t\t\t\tcontinue;\n-\t\t\tbranch = branch_get(ref->refname + 11);\n-\n-\t\t\tif (!branch || !branch->merge || !branch->merge[0] ||\n-\t\t\t !branch->merge[0]->dst)\n-\t\t\t\tcontinue;\n-\t\t\trefname = branch->merge[0]->dst;\n-\t\t} else if (starts_with(name, \"color:\")) {\n-\t\t\tchar color[COLOR_MAXLEN] = \"\";\n-\n-\t\t\tif (color_parse(name + 6, color) < 0)\n-\t\t\t\tdie(_(\"unable to parse format\"));\n-\t\t\tv->s = xstrdup(color);\n-\t\t\tcontinue;\n-\t\t} else if (!strcmp(name, \"flag\")) {\n-\t\t\tchar buf[256], *cp = buf;\n-\t\t\tif (ref->flag & REF_ISSYMREF)\n-\t\t\t\tcp = copy_advance(cp, \",symref\");\n-\t\t\tif (ref->flag & REF_ISPACKED)\n-\t\t\t\tcp = copy_advance(cp, \",packed\");\n-\t\t\tif (cp == buf)\n-\t\t\t\tv->s = \"\";\n-\t\t\telse {\n-\t\t\t\t*cp = '\\0';\n-\t\t\t\tv->s = xstrdup(buf + 1);\n-\t\t\t}\n-\t\t\tcontinue;\n-\t\t} else if (!deref && grab_objectname(name, ref->objectname, v)) {\n-\t\t\tcontinue;\n-\t\t} else if (!strcmp(name, \"HEAD\")) {\n-\t\t\tconst char *head;\n-\t\t\tunsigned char sha1[20];\n-\n-\t\t\thead = resolve_ref_unsafe(\"HEAD\", RESOLVE_REF_READING,\n-\t\t\t\t\t\t sha1, NULL);\n-\t\t\tif (!strcmp(ref->refname, head))\n-\t\t\t\tv->s = \"*\";\n-\t\t\telse\n-\t\t\t\tv->s = \" \";\n-\t\t\tcontinue;\n-\t\t} else\n-\t\t\tcontinue;\n-\n-\t\tformatp = strchr(name, ':');\n-\t\tif (formatp) {\n-\t\t\tint num_ours, num_theirs;\n-\n-\t\t\tformatp++;\n-\t\t\tif (!strcmp(formatp, \"short\"))\n-\t\t\t\trefname = shorten_unambiguous_ref(refname,\n-\t\t\t\t\t\t warn_ambiguous_refs);\n-\t\t\telse if (!strcmp(formatp, \"track\") &&\n-\t\t\t\t starts_with(name, \"upstream\")) {\n-\t\t\t\tchar buf[40];\n-\n-\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n-\t\t\t\t\t\t &num_theirs) != 1)\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tif (!num_ours && !num_theirs)\n-\t\t\t\t\tv->s = \"\";\n-\t\t\t\telse if (!num_ours) {\n-\t\t\t\t\tsprintf(buf, \"[behind %d]\", num_theirs);\n-\t\t\t\t\tv->s = xstrdup(buf);\n-\t\t\t\t} else if (!num_theirs) {\n-\t\t\t\t\tsprintf(buf, \"[ahead %d]\", num_ours);\n-\t\t\t\t\tv->s = xstrdup(buf);\n-\t\t\t\t} else {\n-\t\t\t\t\tsprintf(buf, \"[ahead %d, behind %d]\",\n-\t\t\t\t\t\tnum_ours, num_theirs);\n-\t\t\t\t\tv->s = xstrdup(buf);\n-\t\t\t\t}\n-\t\t\t\tcontinue;\n-\t\t\t} else if (!strcmp(formatp, \"trackshort\") &&\n-\t\t\t\t starts_with(name, \"upstream\")) {\n-\t\t\t\tassert(branch);\n-\n-\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n-\t\t\t\t\t\t\t&num_theirs) != 1)\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tif (!num_ours && !num_theirs)\n-\t\t\t\t\tv->s = \"=\";\n-\t\t\t\telse if (!num_ours)\n-\t\t\t\t\tv->s = \"<\";\n-\t\t\t\telse if (!num_theirs)\n-\t\t\t\t\tv->s = \">\";\n-\t\t\t\telse\n-\t\t\t\t\tv->s = \"<>\";\n-\t\t\t\tcontinue;\n-\t\t\t} else\n-\t\t\t\tdie(\"unknown %.*s format %s\",\n-\t\t\t\t (int)(formatp - name), name, formatp);\n-\t\t}\n-\n-\t\tif (!deref)\n-\t\t\tv->s = refname;\n-\t\telse {\n-\t\t\tint len = strlen(refname);\n-\t\t\tchar *s = xmalloc(len + 4);\n-\t\t\tsprintf(s, \"%s^{}\", refname);\n-\t\t\tv->s = s;\n-\t\t}\n-\t}\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tstruct atom_value *v = &ref->value[i];\n-\t\tif (v->s == NULL)\n-\t\t\tgoto need_obj;\n-\t}\n-\treturn;\n-\n- need_obj:\n-\tbuf = get_obj(ref->objectname, &obj, &size, &eaten);\n-\tif (!buf)\n-\t\tdie(\"missing object %s for %s\",\n-\t\t sha1_to_hex(ref->objectname), ref->refname);\n-\tif (!obj)\n-\t\tdie(\"parse_object_buffer failed on %s for %s\",\n-\t\t sha1_to_hex(ref->objectname), ref->refname);\n-\n-\tgrab_values(ref->value, 0, obj, buf, size);\n-\tif (!eaten)\n-\t\tfree(buf);\n-\n-\t/*\n-\t * If there is no atom that wants to know about tagged\n-\t * object, we are done.\n-\t */\n-\tif (!need_tagged || (obj->type != OBJ_TAG))\n-\t\treturn;\n-\n-\t/*\n-\t * If it is a tag object, see if we use a value that derefs\n-\t * the object, and if we do grab the object it refers to.\n-\t */\n-\ttagged = ((struct tag *)obj)->tagged->sha1;\n-\n-\t/*\n-\t * NEEDSWORK: This derefs tag only once, which\n-\t * is good to deal with chains of trust, but\n-\t * is not consistent with what deref_tag() does\n-\t * which peels the onion to the core.\n-\t */\n-\tbuf = get_obj(tagged, &obj, &size, &eaten);\n-\tif (!buf)\n-\t\tdie(\"missing object %s for %s\",\n-\t\t sha1_to_hex(tagged), ref->refname);\n-\tif (!obj)\n-\t\tdie(\"parse_object_buffer failed on %s for %s\",\n-\t\t sha1_to_hex(tagged), ref->refname);\n-\tgrab_values(ref->value, 1, obj, buf, size);\n-\tif (!eaten)\n-\t\tfree(buf);\n-}\n-\n-/*\n- * Given a ref, return the value for the atom. This lazily gets value\n- * out of the object by calling populate value.\n- */\n-static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n-{\n-\tif (!ref->value) {\n-\t\tpopulate_value(ref);\n-\t\tfill_missing_values(ref->value);\n-\t}\n-\t*v = &ref->value[atom];\n-}\n-\n-/*\n- * Given a refname, return 1 if the refname matches with one of the patterns\n- * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n- * and so on, else return 0. Supports use of wild characters.\n- */\n-static int match_name_as_path(const char **pattern, const char *refname)\n-{\n-\tint namelen = strlen(refname);\n-\tfor (; *pattern; pattern++) {\n-\t\tconst char *p = *pattern;\n-\t\tint plen = strlen(p);\n-\n-\t\tif ((plen <= namelen) &&\n-\t\t !strncmp(refname, p, plen) &&\n-\t\t (refname[plen] == '\\0' ||\n-\t\t refname[plen] == '/' ||\n-\t\t p[plen-1] == '/'))\n-\t\t\treturn 1;\n-\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n-\t\t\treturn 1;\n-\t}\n-\treturn 0;\n-}\n-\n-/* Allocate space for a new ref_array_item and copy the objectname and flag to it */\n-static struct ref_array_item *new_ref_array_item(const char *refname,\n-\t\t\t\t\t\t const unsigned char *objectname,\n-\t\t\t\t\t\t int flag)\n-{\n-\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));\n-\tref->refname = xstrdup(refname);\n-\thashcpy(ref->objectname, objectname);\n-\tref->flag = flag;\n-\n-\treturn ref;\n-}\n-\n-/*\n- * A call-back given to for_each_ref(). Filter refs and keep them for\n- * later object processing.\n- */\n-int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n-{\n-\tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n-\tstruct ref_filter *filter = &ref_cbdata->filter;\n-\tstruct ref_array_item *ref;\n-\n-\tif (flag & REF_BAD_NAME) {\n-\t\t warning(\"ignoring ref with broken name %s\", refname);\n-\t\t return 0;\n-\t}\n-\n-\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))\n-\t\treturn 0;\n-\n-\t/*\n-\t * We do not open the object yet; sort may only need refname\n-\t * to do its job and the resulting list may yet to be pruned\n-\t * by maxcount logic.\n-\t */\n-\tref = new_ref_array_item(refname, sha1, flag);\n-\n-\tREALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1);\n-\tref_cbdata->array.items[ref_cbdata->array.nr++] = ref;\n-\treturn 0;\n-}\n-\n-/* Free memory allocated for a ref_array_item */\n-static void free_array_item(struct ref_array_item *item)\n-{\n-\tfree(item->symref);\n-\tfree(item->refname);\n-\tfree(item);\n-}\n-\n-/* Free all memory allocated for ref_array */\n-void ref_array_clear(struct ref_array *array)\n-{\n-\tint i;\n-\n-\tfor (i = 0; i < array->nr; i++)\n-\t\tfree_array_item(array->items[i]);\n-\tfree(array->items);\n-\tarray->items = NULL;\n-\tarray->nr = array->alloc = 0;\n-}\n-\n-static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)\n-{\n-\tstruct atom_value *va, *vb;\n-\tint cmp;\n-\tcmp_type cmp_type = used_atom_type[s->atom];\n-\n-\tget_ref_atom_value(a, s->atom, &va);\n-\tget_ref_atom_value(b, s->atom, &vb);\n-\tswitch (cmp_type) {\n-\tcase FIELD_STR:\n-\t\tcmp = strcmp(va->s, vb->s);\n-\t\tbreak;\n-\tdefault:\n-\t\tif (va->ul < vb->ul)\n-\t\t\tcmp = -1;\n-\t\telse if (va->ul == vb->ul)\n-\t\t\tcmp = 0;\n-\t\telse\n-\t\t\tcmp = 1;\n-\t\tbreak;\n-\t}\n-\treturn (s->reverse) ? -cmp : cmp;\n-}\n-\n-static struct ref_sorting *ref_sorting;\n-static int compare_refs(const void *a_, const void *b_)\n-{\n-\tstruct ref_array_item *a = *((struct ref_array_item **)a_);\n-\tstruct ref_array_item *b = *((struct ref_array_item **)b_);\n-\tstruct ref_sorting *s;\n-\n-\tfor (s = ref_sorting; s; s = s->next) {\n-\t\tint cmp = cmp_ref_sorting(s, a, b);\n-\t\tif (cmp)\n-\t\t\treturn cmp;\n-\t}\n-\treturn 0;\n-}\n-\n-void ref_array_sort(struct ref_sorting *sort, struct ref_array *array)\n-{\n-\tref_sorting = sort;\n-\tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n-}\n-\n-static void print_value(struct atom_value *v, int quote_style)\n-{\n-\tstruct strbuf sb = STRBUF_INIT;\n-\tswitch (quote_style) {\n-\tcase QUOTE_NONE:\n-\t\tfputs(v->s, stdout);\n-\t\tbreak;\n-\tcase QUOTE_SHELL:\n-\t\tsq_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\tcase QUOTE_PERL:\n-\t\tperl_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\tcase QUOTE_PYTHON:\n-\t\tpython_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\tcase QUOTE_TCL:\n-\t\ttcl_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\t}\n-\tif (quote_style != QUOTE_NONE) {\n-\t\tfputs(sb.buf, stdout);\n-\t\tstrbuf_release(&sb);\n-\t}\n-}\n-\n-static int hex1(char ch)\n-{\n-\tif ('0' <= ch && ch <= '9')\n-\t\treturn ch - '0';\n-\telse if ('a' <= ch && ch <= 'f')\n-\t\treturn ch - 'a' + 10;\n-\telse if ('A' <= ch && ch <= 'F')\n-\t\treturn ch - 'A' + 10;\n-\treturn -1;\n-}\n-static int hex2(const char *cp)\n-{\n-\tif (cp[0] && cp[1])\n-\t\treturn (hex1(cp[0]) << 4) | hex1(cp[1]);\n-\telse\n-\t\treturn -1;\n-}\n-\n-static void emit(const char *cp, const char *ep)\n-{\n-\twhile (*cp && (!ep || cp < ep)) {\n-\t\tif (*cp == '%') {\n-\t\t\tif (cp[1] == '%')\n-\t\t\t\tcp++;\n-\t\t\telse {\n-\t\t\t\tint ch = hex2(cp + 1);\n-\t\t\t\tif (0 <= ch) {\n-\t\t\t\t\tputchar(ch);\n-\t\t\t\t\tcp += 3;\n-\t\t\t\t\tcontinue;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tputchar(*cp);\n-\t\tcp++;\n-\t}\n-}\n-\n-void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)\n-{\n-\tconst char *cp, *sp, *ep;\n-\n-\tfor (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {\n-\t\tstruct atom_value *atomv;\n-\n-\t\tep = strchr(sp, ')');\n-\t\tif (cp < sp)\n-\t\t\temit(cp, sp);\n-\t\tget_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);\n-\t\tprint_value(atomv, quote_style);\n-\t}\n-\tif (*cp) {\n-\t\tsp = cp + strlen(cp);\n-\t\temit(cp, sp);\n-\t}\n-\tif (need_color_reset_at_eol) {\n-\t\tstruct atom_value resetv;\n-\t\tchar color[COLOR_MAXLEN] = \"\";\n-\n-\t\tif (color_parse(\"reset\", color) < 0)\n-\t\t\tdie(\"BUG: couldn't parse 'reset' as a color\");\n-\t\tresetv.s = color;\n-\t\tprint_value(&resetv, quote_style);\n-\t}\n-\tputchar('\\n');\n-}\n-\n-/* If no sorting option is given, use refname to sort as default */\n-struct ref_sorting *ref_default_sorting(void)\n-{\n-\tstatic const char cstr_name[] = \"refname\";\n-\n-\tstruct ref_sorting *sort = xcalloc(1, sizeof(*sort));\n-\n-\tsort->next = NULL;\n-\tsort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n-\treturn sort;\n-}\n-\n-int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n-{\n-\tstruct ref_sorting **sort_tail = opt->value;\n-\tstruct ref_sorting *s;\n-\tint len;\n-\n-\tif (!arg) /* should --no-sort void the list ? */\n-\t\treturn -1;\n-\n-\ts = xcalloc(1, sizeof(*s));\n-\ts->next = *sort_tail;\n-\t*sort_tail = s;\n-\n-\tif (*arg == '-') {\n-\t\ts->reverse = 1;\n-\t\targ++;\n-\t}\n-\tlen = strlen(arg);\n-\ts->atom = parse_ref_filter_atom(arg, arg+len);\n-\treturn 0;\n-}\n-\n static char const * const for_each_ref_usage[] = {\n \tN_(\"git for-each-ref [] []\"),\n \tNULL\ndiff --git a/ref-filter.c b/ref-filter.c\nnew file mode 100644\nindex 0000000..95e72f6\n--- /dev/null\n+++ b/ref-filter.c\n@@ -0,0 +1,1062 @@\n+#include \"builtin.h\"\n+#include \"cache.h\"\n+#include \"parse-options.h\"\n+#include \"refs.h\"\n+#include \"wildmatch.h\"\n+#include \"commit.h\"\n+#include \"remote.h\"\n+#include \"color.h\"\n+#include \"tag.h\"\n+#include \"quote.h\"\n+\n+typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;\n+\n+static struct {\n+\tconst char *name;\n+\tcmp_type cmp_type;\n+} valid_atom[] = {\n+\t{ \"refname\" },\n+\t{ \"objecttype\" },\n+\t{ \"objectsize\", FIELD_ULONG },\n+\t{ \"objectname\" },\n+\t{ \"tree\" },\n+\t{ \"parent\" },\n+\t{ \"numparent\", FIELD_ULONG },\n+\t{ \"object\" },\n+\t{ \"type\" },\n+\t{ \"tag\" },\n+\t{ \"author\" },\n+\t{ \"authorname\" },\n+\t{ \"authoremail\" },\n+\t{ \"authordate\", FIELD_TIME },\n+\t{ \"committer\" },\n+\t{ \"committername\" },\n+\t{ \"committeremail\" },\n+\t{ \"committerdate\", FIELD_TIME },\n+\t{ \"tagger\" },\n+\t{ \"taggername\" },\n+\t{ \"taggeremail\" },\n+\t{ \"taggerdate\", FIELD_TIME },\n+\t{ \"creator\" },\n+\t{ \"creatordate\", FIELD_TIME },\n+\t{ \"subject\" },\n+\t{ \"body\" },\n+\t{ \"contents\" },\n+\t{ \"contents:subject\" },\n+\t{ \"contents:body\" },\n+\t{ \"contents:signature\" },\n+\t{ \"upstream\" },\n+\t{ \"symref\" },\n+\t{ \"flag\" },\n+\t{ \"HEAD\" },\n+\t{ \"color\" },\n+};\n+\n+/*\n+ * An atom is a valid field atom listed above, possibly prefixed with\n+ * a \"*\" to denote deref_tag().\n+ *\n+ * We parse given format string and sort specifiers, and make a list\n+ * of properties that we need to extract out of objects. ref_array_item\n+ * structure will hold an array of values extracted that can be\n+ * indexed with the \"atom number\", which is an index into this\n+ * array.\n+ */\n+static const char **used_atom;\n+static cmp_type *used_atom_type;\n+static int used_atom_cnt, need_tagged, need_symref;\n+static int need_color_reset_at_eol;\n+\n+/*\n+ * Used to parse format string and sort specifiers\n+ */\n+int parse_ref_filter_atom(const char *atom, const char *ep)\n+{\n+\tconst char *sp;\n+\tint i, at;\n+\n+\tsp = atom;\n+\tif (*sp == '*' && sp < ep)\n+\t\tsp++; /* deref */\n+\tif (ep <= sp)\n+\t\tdie(\"malformed field name: %.*s\", (int)(ep-atom), atom);\n+\n+\t/* Do we have the atom already used elsewhere? */\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tint len = strlen(used_atom[i]);\n+\t\tif (len == ep - atom && !memcmp(used_atom[i], atom, len))\n+\t\t\treturn i;\n+\t}\n+\n+\t/* Is the atom a valid one? */\n+\tfor (i = 0; i < ARRAY_SIZE(valid_atom); i++) {\n+\t\tint len = strlen(valid_atom[i].name);\n+\t\t/*\n+\t\t * If the atom name has a colon, strip it and everything after\n+\t\t * it off - it specifies the format for this entry, and\n+\t\t * shouldn't be used for checking against the valid_atom\n+\t\t * table.\n+\t\t */\n+\t\tconst char *formatp = strchr(sp, ':');\n+\t\tif (!formatp || ep < formatp)\n+\t\t\tformatp = ep;\n+\t\tif (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len))\n+\t\t\tbreak;\n+\t}\n+\n+\tif (ARRAY_SIZE(valid_atom) <= i)\n+\t\tdie(\"unknown field name: %.*s\", (int)(ep-atom), atom);\n+\n+\t/* Add it in, including the deref prefix */\n+\tat = used_atom_cnt;\n+\tused_atom_cnt++;\n+\tREALLOC_ARRAY(used_atom, used_atom_cnt);\n+\tREALLOC_ARRAY(used_atom_type, used_atom_cnt);\n+\tused_atom[at] = xmemdupz(atom, ep - atom);\n+\tused_atom_type[at] = valid_atom[i].cmp_type;\n+\tif (*atom == '*')\n+\t\tneed_tagged = 1;\n+\tif (!strcmp(used_atom[at], \"symref\"))\n+\t\tneed_symref = 1;\n+\treturn at;\n+}\n+\n+/*\n+ * In a format string, find the next occurrence of %(atom).\n+ */\n+static const char *find_next(const char *cp)\n+{\n+\twhile (*cp) {\n+\t\tif (*cp == '%') {\n+\t\t\t/*\n+\t\t\t * %( is the start of an atom;\n+\t\t\t * %% is a quoted per-cent.\n+\t\t\t */\n+\t\t\tif (cp[1] == '(')\n+\t\t\t\treturn cp;\n+\t\t\telse if (cp[1] == '%')\n+\t\t\t\tcp++; /* skip over two % */\n+\t\t\t/* otherwise this is a singleton, literal % */\n+\t\t}\n+\t\tcp++;\n+\t}\n+\treturn NULL;\n+}\n+\n+/*\n+ * Make sure the format string is well formed, and parse out\n+ * the used atoms.\n+ */\n+int verify_ref_format(const char *format)\n+{\n+\tconst char *cp, *sp;\n+\n+\tneed_color_reset_at_eol = 0;\n+\tfor (cp = format; *cp && (sp = find_next(cp)); ) {\n+\t\tconst char *color, *ep = strchr(sp, ')');\n+\t\tint at;\n+\n+\t\tif (!ep)\n+\t\t\treturn error(\"malformed format string %s\", sp);\n+\t\t/* sp points at \"%(\" and ep points at the closing \")\" */\n+\t\tat = parse_ref_filter_atom(sp + 2, ep);\n+\t\tcp = ep + 1;\n+\n+\t\tif (skip_prefix(used_atom[at], \"color:\", &color))\n+\t\t\tneed_color_reset_at_eol = !!strcmp(color, \"reset\");\n+\t}\n+\treturn 0;\n+}\n+\n+/*\n+ * Given an object name, read the object data and size, and return a\n+ * \"struct object\". If the object data we are returning is also borrowed\n+ * by the \"struct object\" representation, set *eaten as well---it is a\n+ * signal from parse_object_buffer to us not to free the buffer.\n+ */\n+static void *get_obj(const unsigned char *sha1, struct object **obj, unsigned long *sz, int *eaten)\n+{\n+\tenum object_type type;\n+\tvoid *buf = read_sha1_file(sha1, &type, sz);\n+\n+\tif (buf)\n+\t\t*obj = parse_object_buffer(sha1, type, *sz, buf, eaten);\n+\telse\n+\t\t*obj = NULL;\n+\treturn buf;\n+}\n+\n+static int grab_objectname(const char *name, const unsigned char *sha1,\n+\t\t\t struct atom_value *v)\n+{\n+\tif (!strcmp(name, \"objectname\")) {\n+\t\tchar *s = xmalloc(41);\n+\t\tstrcpy(s, sha1_to_hex(sha1));\n+\t\tv->s = s;\n+\t\treturn 1;\n+\t}\n+\tif (!strcmp(name, \"objectname:short\")) {\n+\t\tv->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));\n+\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n+/* See grab_values */\n+static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (!strcmp(name, \"objecttype\"))\n+\t\t\tv->s = typename(obj->type);\n+\t\telse if (!strcmp(name, \"objectsize\")) {\n+\t\t\tchar *s = xmalloc(40);\n+\t\t\tsprintf(s, \"%lu\", sz);\n+\t\t\tv->ul = sz;\n+\t\t\tv->s = s;\n+\t\t}\n+\t\telse if (deref)\n+\t\t\tgrab_objectname(name, obj->sha1, v);\n+\t}\n+}\n+\n+/* See grab_values */\n+static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tstruct tag *tag = (struct tag *) obj;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (!strcmp(name, \"tag\"))\n+\t\t\tv->s = tag->tag;\n+\t\telse if (!strcmp(name, \"type\") && tag->tagged)\n+\t\t\tv->s = typename(tag->tagged->type);\n+\t\telse if (!strcmp(name, \"object\") && tag->tagged) {\n+\t\t\tchar *s = xmalloc(41);\n+\t\t\tstrcpy(s, sha1_to_hex(tag->tagged->sha1));\n+\t\t\tv->s = s;\n+\t\t}\n+\t}\n+}\n+\n+/* See grab_values */\n+static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tstruct commit *commit = (struct commit *) obj;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (!strcmp(name, \"tree\")) {\n+\t\t\tchar *s = xmalloc(41);\n+\t\t\tstrcpy(s, sha1_to_hex(commit->tree->object.sha1));\n+\t\t\tv->s = s;\n+\t\t}\n+\t\tif (!strcmp(name, \"numparent\")) {\n+\t\t\tchar *s = xmalloc(40);\n+\t\t\tv->ul = commit_list_count(commit->parents);\n+\t\t\tsprintf(s, \"%lu\", v->ul);\n+\t\t\tv->s = s;\n+\t\t}\n+\t\telse if (!strcmp(name, \"parent\")) {\n+\t\t\tint num = commit_list_count(commit->parents);\n+\t\t\tint i;\n+\t\t\tstruct commit_list *parents;\n+\t\t\tchar *s = xmalloc(41 * num + 1);\n+\t\t\tv->s = s;\n+\t\t\tfor (i = 0, parents = commit->parents;\n+\t\t\t parents;\n+\t\t\t parents = parents->next, i = i + 41) {\n+\t\t\t\tstruct commit *parent = parents->item;\n+\t\t\t\tstrcpy(s+i, sha1_to_hex(parent->object.sha1));\n+\t\t\t\tif (parents->next)\n+\t\t\t\t\ts[i+40] = ' ';\n+\t\t\t}\n+\t\t\tif (!i)\n+\t\t\t\t*s = '\\0';\n+\t\t}\n+\t}\n+}\n+\n+static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz)\n+{\n+\tconst char *eol;\n+\twhile (*buf) {\n+\t\tif (!strncmp(buf, who, wholen) &&\n+\t\t buf[wholen] == ' ')\n+\t\t\treturn buf + wholen + 1;\n+\t\teol = strchr(buf, '\\n');\n+\t\tif (!eol)\n+\t\t\treturn \"\";\n+\t\teol++;\n+\t\tif (*eol == '\\n')\n+\t\t\treturn \"\"; /* end of header */\n+\t\tbuf = eol;\n+\t}\n+\treturn \"\";\n+}\n+\n+static const char *copy_line(const char *buf)\n+{\n+\tconst char *eol = strchrnul(buf, '\\n');\n+\treturn xmemdupz(buf, eol - buf);\n+}\n+\n+static const char *copy_name(const char *buf)\n+{\n+\tconst char *cp;\n+\tfor (cp = buf; *cp && *cp != '\\n'; cp++) {\n+\t\tif (!strncmp(cp, \" <\", 2))\n+\t\t\treturn xmemdupz(buf, cp - buf);\n+\t}\n+\treturn \"\";\n+}\n+\n+static const char *copy_email(const char *buf)\n+{\n+\tconst char *email = strchr(buf, '<');\n+\tconst char *eoemail;\n+\tif (!email)\n+\t\treturn \"\";\n+\teoemail = strchr(email, '>');\n+\tif (!eoemail)\n+\t\treturn \"\";\n+\treturn xmemdupz(email, eoemail + 1 - email);\n+}\n+\n+static char *copy_subject(const char *buf, unsigned long len)\n+{\n+\tchar *r = xmemdupz(buf, len);\n+\tint i;\n+\n+\tfor (i = 0; i < len; i++)\n+\t\tif (r[i] == '\\n')\n+\t\t\tr[i] = ' ';\n+\n+\treturn r;\n+}\n+\n+static void grab_date(const char *buf, struct atom_value *v, const char *atomname)\n+{\n+\tconst char *eoemail = strstr(buf, \"> \");\n+\tchar *zone;\n+\tunsigned long timestamp;\n+\tlong tz;\n+\tenum date_mode date_mode = DATE_NORMAL;\n+\tconst char *formatp;\n+\n+\t/*\n+\t * We got here because atomname ends in \"date\" or \"date\";\n+\t * it's not possible that is not \":\" because\n+\t * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no\n+\t * \":\" means no format is specified, and use the default.\n+\t */\n+\tformatp = strchr(atomname, ':');\n+\tif (formatp != NULL) {\n+\t\tformatp++;\n+\t\tdate_mode = parse_date_format(formatp);\n+\t}\n+\n+\tif (!eoemail)\n+\t\tgoto bad;\n+\ttimestamp = strtoul(eoemail + 2, &zone, 10);\n+\tif (timestamp == ULONG_MAX)\n+\t\tgoto bad;\n+\ttz = strtol(zone, NULL, 10);\n+\tif ((tz == LONG_MIN || tz == LONG_MAX) && errno == ERANGE)\n+\t\tgoto bad;\n+\tv->s = xstrdup(show_date(timestamp, tz, date_mode));\n+\tv->ul = timestamp;\n+\treturn;\n+ bad:\n+\tv->s = \"\";\n+\tv->ul = 0;\n+}\n+\n+/* See grab_values */\n+static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tint wholen = strlen(who);\n+\tconst char *wholine = NULL;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (strncmp(who, name, wholen))\n+\t\t\tcontinue;\n+\t\tif (name[wholen] != 0 &&\n+\t\t strcmp(name + wholen, \"name\") &&\n+\t\t strcmp(name + wholen, \"email\") &&\n+\t\t !starts_with(name + wholen, \"date\"))\n+\t\t\tcontinue;\n+\t\tif (!wholine)\n+\t\t\twholine = find_wholine(who, wholen, buf, sz);\n+\t\tif (!wholine)\n+\t\t\treturn; /* no point looking for it */\n+\t\tif (name[wholen] == 0)\n+\t\t\tv->s = copy_line(wholine);\n+\t\telse if (!strcmp(name + wholen, \"name\"))\n+\t\t\tv->s = copy_name(wholine);\n+\t\telse if (!strcmp(name + wholen, \"email\"))\n+\t\t\tv->s = copy_email(wholine);\n+\t\telse if (starts_with(name + wholen, \"date\"))\n+\t\t\tgrab_date(wholine, v, name);\n+\t}\n+\n+\t/*\n+\t * For a tag or a commit object, if \"creator\" or \"creatordate\" is\n+\t * requested, do something special.\n+\t */\n+\tif (strcmp(who, \"tagger\") && strcmp(who, \"committer\"))\n+\t\treturn; /* \"author\" for commit object is not wanted */\n+\tif (!wholine)\n+\t\twholine = find_wholine(who, wholen, buf, sz);\n+\tif (!wholine)\n+\t\treturn;\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\n+\t\tif (starts_with(name, \"creatordate\"))\n+\t\t\tgrab_date(wholine, v, name);\n+\t\telse if (!strcmp(name, \"creator\"))\n+\t\t\tv->s = copy_line(wholine);\n+\t}\n+}\n+\n+static void find_subpos(const char *buf, unsigned long sz,\n+\t\t\tconst char **sub, unsigned long *sublen,\n+\t\t\tconst char **body, unsigned long *bodylen,\n+\t\t\tunsigned long *nonsiglen,\n+\t\t\tconst char **sig, unsigned long *siglen)\n+{\n+\tconst char *eol;\n+\t/* skip past header until we hit empty line */\n+\twhile (*buf && *buf != '\\n') {\n+\t\teol = strchrnul(buf, '\\n');\n+\t\tif (*eol)\n+\t\t\teol++;\n+\t\tbuf = eol;\n+\t}\n+\t/* skip any empty lines */\n+\twhile (*buf == '\\n')\n+\t\tbuf++;\n+\n+\t/* parse signature first; we might not even have a subject line */\n+\t*sig = buf + parse_signature(buf, strlen(buf));\n+\t*siglen = strlen(*sig);\n+\n+\t/* subject is first non-empty line */\n+\t*sub = buf;\n+\t/* subject goes to first empty line */\n+\twhile (buf < *sig && *buf && *buf != '\\n') {\n+\t\teol = strchrnul(buf, '\\n');\n+\t\tif (*eol)\n+\t\t\teol++;\n+\t\tbuf = eol;\n+\t}\n+\t*sublen = buf - *sub;\n+\t/* drop trailing newline, if present */\n+\tif (*sublen && (*sub)[*sublen - 1] == '\\n')\n+\t\t*sublen -= 1;\n+\n+\t/* skip any empty lines */\n+\twhile (*buf == '\\n')\n+\t\tbuf++;\n+\t*body = buf;\n+\t*bodylen = strlen(buf);\n+\t*nonsiglen = *sig - buf;\n+}\n+\n+/* See grab_values */\n+static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tconst char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;\n+\tunsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (strcmp(name, \"subject\") &&\n+\t\t strcmp(name, \"body\") &&\n+\t\t strcmp(name, \"contents\") &&\n+\t\t strcmp(name, \"contents:subject\") &&\n+\t\t strcmp(name, \"contents:body\") &&\n+\t\t strcmp(name, \"contents:signature\"))\n+\t\t\tcontinue;\n+\t\tif (!subpos)\n+\t\t\tfind_subpos(buf, sz,\n+\t\t\t\t &subpos, &sublen,\n+\t\t\t\t &bodypos, &bodylen, &nonsiglen,\n+\t\t\t\t &sigpos, &siglen);\n+\n+\t\tif (!strcmp(name, \"subject\"))\n+\t\t\tv->s = copy_subject(subpos, sublen);\n+\t\telse if (!strcmp(name, \"contents:subject\"))\n+\t\t\tv->s = copy_subject(subpos, sublen);\n+\t\telse if (!strcmp(name, \"body\"))\n+\t\t\tv->s = xmemdupz(bodypos, bodylen);\n+\t\telse if (!strcmp(name, \"contents:body\"))\n+\t\t\tv->s = xmemdupz(bodypos, nonsiglen);\n+\t\telse if (!strcmp(name, \"contents:signature\"))\n+\t\t\tv->s = xmemdupz(sigpos, siglen);\n+\t\telse if (!strcmp(name, \"contents\"))\n+\t\t\tv->s = xstrdup(subpos);\n+\t}\n+}\n+\n+/*\n+ * We want to have empty print-string for field requests\n+ * that do not apply (e.g. \"authordate\" for a tag object)\n+ */\n+static void fill_missing_values(struct atom_value *val)\n+{\n+\tint i;\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (v->s == NULL)\n+\t\t\tv->s = \"\";\n+\t}\n+}\n+\n+/*\n+ * val is a list of atom_value to hold returned values. Extract\n+ * the values for atoms in used_atom array out of (obj, buf, sz).\n+ * when deref is false, (obj, buf, sz) is the object that is\n+ * pointed at by the ref itself; otherwise it is the object the\n+ * ref (which is a tag) refers to.\n+ */\n+static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tgrab_common_values(val, deref, obj, buf, sz);\n+\tswitch (obj->type) {\n+\tcase OBJ_TAG:\n+\t\tgrab_tag_values(val, deref, obj, buf, sz);\n+\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n+\t\tgrab_person(\"tagger\", val, deref, obj, buf, sz);\n+\t\tbreak;\n+\tcase OBJ_COMMIT:\n+\t\tgrab_commit_values(val, deref, obj, buf, sz);\n+\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n+\t\tgrab_person(\"author\", val, deref, obj, buf, sz);\n+\t\tgrab_person(\"committer\", val, deref, obj, buf, sz);\n+\t\tbreak;\n+\tcase OBJ_TREE:\n+\t\t/* grab_tree_values(val, deref, obj, buf, sz); */\n+\t\tbreak;\n+\tcase OBJ_BLOB:\n+\t\t/* grab_blob_values(val, deref, obj, buf, sz); */\n+\t\tbreak;\n+\tdefault:\n+\t\tdie(\"Eh? Object of type %d?\", obj->type);\n+\t}\n+}\n+\n+static inline char *copy_advance(char *dst, const char *src)\n+{\n+\twhile (*src)\n+\t\t*dst++ = *src++;\n+\treturn dst;\n+}\n+\n+/*\n+ * Parse the object referred by ref, and grab needed value.\n+ */\n+static void populate_value(struct ref_array_item *ref)\n+{\n+\tvoid *buf;\n+\tstruct object *obj;\n+\tint eaten, i;\n+\tunsigned long size;\n+\tconst unsigned char *tagged;\n+\n+\tref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));\n+\n+\tif (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {\n+\t\tunsigned char unused1[20];\n+\t\tref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,\n+\t\t\t\t\t unused1, NULL);\n+\t\tif (!ref->symref)\n+\t\t\tref->symref = \"\";\n+\t}\n+\n+\t/* Fill in specials first */\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &ref->value[i];\n+\t\tint deref = 0;\n+\t\tconst char *refname;\n+\t\tconst char *formatp;\n+\t\tstruct branch *branch = NULL;\n+\n+\t\tif (*name == '*') {\n+\t\t\tderef = 1;\n+\t\t\tname++;\n+\t\t}\n+\n+\t\tif (starts_with(name, \"refname\"))\n+\t\t\trefname = ref->refname;\n+\t\telse if (starts_with(name, \"symref\"))\n+\t\t\trefname = ref->symref ? ref->symref : \"\";\n+\t\telse if (starts_with(name, \"upstream\")) {\n+\t\t\t/* only local branches may have an upstream */\n+\t\t\tif (!starts_with(ref->refname, \"refs/heads/\"))\n+\t\t\t\tcontinue;\n+\t\t\tbranch = branch_get(ref->refname + 11);\n+\n+\t\t\tif (!branch || !branch->merge || !branch->merge[0] ||\n+\t\t\t !branch->merge[0]->dst)\n+\t\t\t\tcontinue;\n+\t\t\trefname = branch->merge[0]->dst;\n+\t\t} else if (starts_with(name, \"color:\")) {\n+\t\t\tchar color[COLOR_MAXLEN] = \"\";\n+\n+\t\t\tif (color_parse(name + 6, color) < 0)\n+\t\t\t\tdie(_(\"unable to parse format\"));\n+\t\t\tv->s = xstrdup(color);\n+\t\t\tcontinue;\n+\t\t} else if (!strcmp(name, \"flag\")) {\n+\t\t\tchar buf[256], *cp = buf;\n+\t\t\tif (ref->flag & REF_ISSYMREF)\n+\t\t\t\tcp = copy_advance(cp, \",symref\");\n+\t\t\tif (ref->flag & REF_ISPACKED)\n+\t\t\t\tcp = copy_advance(cp, \",packed\");\n+\t\t\tif (cp == buf)\n+\t\t\t\tv->s = \"\";\n+\t\t\telse {\n+\t\t\t\t*cp = '\\0';\n+\t\t\t\tv->s = xstrdup(buf + 1);\n+\t\t\t}\n+\t\t\tcontinue;\n+\t\t} else if (!deref && grab_objectname(name, ref->objectname, v)) {\n+\t\t\tcontinue;\n+\t\t} else if (!strcmp(name, \"HEAD\")) {\n+\t\t\tconst char *head;\n+\t\t\tunsigned char sha1[20];\n+\n+\t\t\thead = resolve_ref_unsafe(\"HEAD\", RESOLVE_REF_READING,\n+\t\t\t\t\t\t sha1, NULL);\n+\t\t\tif (!strcmp(ref->refname, head))\n+\t\t\t\tv->s = \"*\";\n+\t\t\telse\n+\t\t\t\tv->s = \" \";\n+\t\t\tcontinue;\n+\t\t} else\n+\t\t\tcontinue;\n+\n+\t\tformatp = strchr(name, ':');\n+\t\tif (formatp) {\n+\t\t\tint num_ours, num_theirs;\n+\n+\t\t\tformatp++;\n+\t\t\tif (!strcmp(formatp, \"short\"))\n+\t\t\t\trefname = shorten_unambiguous_ref(refname,\n+\t\t\t\t\t\t warn_ambiguous_refs);\n+\t\t\telse if (!strcmp(formatp, \"track\") &&\n+\t\t\t\t starts_with(name, \"upstream\")) {\n+\t\t\t\tchar buf[40];\n+\n+\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n+\t\t\t\t\t\t &num_theirs) != 1)\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (!num_ours && !num_theirs)\n+\t\t\t\t\tv->s = \"\";\n+\t\t\t\telse if (!num_ours) {\n+\t\t\t\t\tsprintf(buf, \"[behind %d]\", num_theirs);\n+\t\t\t\t\tv->s = xstrdup(buf);\n+\t\t\t\t} else if (!num_theirs) {\n+\t\t\t\t\tsprintf(buf, \"[ahead %d]\", num_ours);\n+\t\t\t\t\tv->s = xstrdup(buf);\n+\t\t\t\t} else {\n+\t\t\t\t\tsprintf(buf, \"[ahead %d, behind %d]\",\n+\t\t\t\t\t\tnum_ours, num_theirs);\n+\t\t\t\t\tv->s = xstrdup(buf);\n+\t\t\t\t}\n+\t\t\t\tcontinue;\n+\t\t\t} else if (!strcmp(formatp, \"trackshort\") &&\n+\t\t\t\t starts_with(name, \"upstream\")) {\n+\t\t\t\tassert(branch);\n+\n+\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n+\t\t\t\t\t\t\t&num_theirs) != 1)\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (!num_ours && !num_theirs)\n+\t\t\t\t\tv->s = \"=\";\n+\t\t\t\telse if (!num_ours)\n+\t\t\t\t\tv->s = \"<\";\n+\t\t\t\telse if (!num_theirs)\n+\t\t\t\t\tv->s = \">\";\n+\t\t\t\telse\n+\t\t\t\t\tv->s = \"<>\";\n+\t\t\t\tcontinue;\n+\t\t\t} else\n+\t\t\t\tdie(\"unknown %.*s format %s\",\n+\t\t\t\t (int)(formatp - name), name, formatp);\n+\t\t}\n+\n+\t\tif (!deref)\n+\t\t\tv->s = refname;\n+\t\telse {\n+\t\t\tint len = strlen(refname);\n+\t\t\tchar *s = xmalloc(len + 4);\n+\t\t\tsprintf(s, \"%s^{}\", refname);\n+\t\t\tv->s = s;\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tstruct atom_value *v = &ref->value[i];\n+\t\tif (v->s == NULL)\n+\t\t\tgoto need_obj;\n+\t}\n+\treturn;\n+\n+ need_obj:\n+\tbuf = get_obj(ref->objectname, &obj, &size, &eaten);\n+\tif (!buf)\n+\t\tdie(\"missing object %s for %s\",\n+\t\t sha1_to_hex(ref->objectname), ref->refname);\n+\tif (!obj)\n+\t\tdie(\"parse_object_buffer failed on %s for %s\",\n+\t\t sha1_to_hex(ref->objectname), ref->refname);\n+\n+\tgrab_values(ref->value, 0, obj, buf, size);\n+\tif (!eaten)\n+\t\tfree(buf);\n+\n+\t/*\n+\t * If there is no atom that wants to know about tagged\n+\t * object, we are done.\n+\t */\n+\tif (!need_tagged || (obj->type != OBJ_TAG))\n+\t\treturn;\n+\n+\t/*\n+\t * If it is a tag object, see if we use a value that derefs\n+\t * the object, and if we do grab the object it refers to.\n+\t */\n+\ttagged = ((struct tag *)obj)->tagged->sha1;\n+\n+\t/*\n+\t * NEEDSWORK: This derefs tag only once, which\n+\t * is good to deal with chains of trust, but\n+\t * is not consistent with what deref_tag() does\n+\t * which peels the onion to the core.\n+\t */\n+\tbuf = get_obj(tagged, &obj, &size, &eaten);\n+\tif (!buf)\n+\t\tdie(\"missing object %s for %s\",\n+\t\t sha1_to_hex(tagged), ref->refname);\n+\tif (!obj)\n+\t\tdie(\"parse_object_buffer failed on %s for %s\",\n+\t\t sha1_to_hex(tagged), ref->refname);\n+\tgrab_values(ref->value, 1, obj, buf, size);\n+\tif (!eaten)\n+\t\tfree(buf);\n+}\n+\n+/*\n+ * Given a ref, return the value for the atom. This lazily gets value\n+ * out of the object by calling populate value.\n+ */\n+static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n+{\n+\tif (!ref->value) {\n+\t\tpopulate_value(ref);\n+\t\tfill_missing_values(ref->value);\n+\t}\n+\t*v = &ref->value[atom];\n+}\n+\n+/*\n+ * Given a refname, return 1 if the refname matches with one of the patterns\n+ * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n+ * and so on, else return 0. Supports use of wild characters.\n+ */\n+static int match_name_as_path(const char **pattern, const char *refname)\n+{\n+\tint namelen = strlen(refname);\n+\tfor (; *pattern; pattern++) {\n+\t\tconst char *p = *pattern;\n+\t\tint plen = strlen(p);\n+\n+\t\tif ((plen <= namelen) &&\n+\t\t !strncmp(refname, p, plen) &&\n+\t\t (refname[plen] == '\\0' ||\n+\t\t refname[plen] == '/' ||\n+\t\t p[plen-1] == '/'))\n+\t\t\treturn 1;\n+\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n+\t\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n+/* Allocate space for a new ref_array_item and copy the objectname and flag to it */\n+static struct ref_array_item *new_ref_array_item(const char *refname,\n+\t\t\t\t\t\t const unsigned char *objectname,\n+\t\t\t\t\t\t int flag)\n+{\n+\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));\n+\tref->refname = xstrdup(refname);\n+\thashcpy(ref->objectname, objectname);\n+\tref->flag = flag;\n+\n+\treturn ref;\n+}\n+\n+/*\n+ * A call-back given to for_each_ref(). Filter refs and keep them for\n+ * later object processing.\n+ */\n+int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n+{\n+\tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n+\tstruct ref_filter *filter = &ref_cbdata->filter;\n+\tstruct ref_array_item *ref;\n+\n+\tif (flag & REF_BAD_NAME) {\n+\t\t warning(\"ignoring ref with broken name %s\", refname);\n+\t\t return 0;\n+\t}\n+\n+\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))\n+\t\treturn 0;\n+\n+\t/*\n+\t * We do not open the object yet; sort may only need refname\n+\t * to do its job and the resulting list may yet to be pruned\n+\t * by maxcount logic.\n+\t */\n+\tref = new_ref_array_item(refname, sha1, flag);\n+\n+\tREALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1);\n+\tref_cbdata->array.items[ref_cbdata->array.nr++] = ref;\n+\treturn 0;\n+}\n+\n+/* Free memory allocated for a ref_array_item */\n+static void free_array_item(struct ref_array_item *item)\n+{\n+\tfree(item->symref);\n+\tfree(item->refname);\n+\tfree(item);\n+}\n+\n+/* Free all memory allocated for ref_array */\n+void ref_array_clear(struct ref_array *array)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < array->nr; i++)\n+\t\tfree_array_item(array->items[i]);\n+\tfree(array->items);\n+\tarray->items = NULL;\n+\tarray->nr = array->alloc = 0;\n+}\n+\n+static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)\n+{\n+\tstruct atom_value *va, *vb;\n+\tint cmp;\n+\tcmp_type cmp_type = used_atom_type[s->atom];\n+\n+\tget_ref_atom_value(a, s->atom, &va);\n+\tget_ref_atom_value(b, s->atom, &vb);\n+\tswitch (cmp_type) {\n+\tcase FIELD_STR:\n+\t\tcmp = strcmp(va->s, vb->s);\n+\t\tbreak;\n+\tdefault:\n+\t\tif (va->ul < vb->ul)\n+\t\t\tcmp = -1;\n+\t\telse if (va->ul == vb->ul)\n+\t\t\tcmp = 0;\n+\t\telse\n+\t\t\tcmp = 1;\n+\t\tbreak;\n+\t}\n+\treturn (s->reverse) ? -cmp : cmp;\n+}\n+\n+static struct ref_sorting *ref_sorting;\n+static int compare_refs(const void *a_, const void *b_)\n+{\n+\tstruct ref_array_item *a = *((struct ref_array_item **)a_);\n+\tstruct ref_array_item *b = *((struct ref_array_item **)b_);\n+\tstruct ref_sorting *s;\n+\n+\tfor (s = ref_sorting; s; s = s->next) {\n+\t\tint cmp = cmp_ref_sorting(s, a, b);\n+\t\tif (cmp)\n+\t\t\treturn cmp;\n+\t}\n+\treturn 0;\n+}\n+\n+void ref_array_sort(struct ref_sorting *sort, struct ref_array *array)\n+{\n+\tref_sorting = sort;\n+\tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n+}\n+\n+static void print_value(struct atom_value *v, int quote_style)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tswitch (quote_style) {\n+\tcase QUOTE_NONE:\n+\t\tfputs(v->s, stdout);\n+\t\tbreak;\n+\tcase QUOTE_SHELL:\n+\t\tsq_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\tcase QUOTE_PERL:\n+\t\tperl_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\tcase QUOTE_PYTHON:\n+\t\tpython_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\tcase QUOTE_TCL:\n+\t\ttcl_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\t}\n+\tif (quote_style != QUOTE_NONE) {\n+\t\tfputs(sb.buf, stdout);\n+\t\tstrbuf_release(&sb);\n+\t}\n+}\n+\n+static int hex1(char ch)\n+{\n+\tif ('0' <= ch && ch <= '9')\n+\t\treturn ch - '0';\n+\telse if ('a' <= ch && ch <= 'f')\n+\t\treturn ch - 'a' + 10;\n+\telse if ('A' <= ch && ch <= 'F')\n+\t\treturn ch - 'A' + 10;\n+\treturn -1;\n+}\n+static int hex2(const char *cp)\n+{\n+\tif (cp[0] && cp[1])\n+\t\treturn (hex1(cp[0]) << 4) | hex1(cp[1]);\n+\telse\n+\t\treturn -1;\n+}\n+\n+static void emit(const char *cp, const char *ep)\n+{\n+\twhile (*cp && (!ep || cp < ep)) {\n+\t\tif (*cp == '%') {\n+\t\t\tif (cp[1] == '%')\n+\t\t\t\tcp++;\n+\t\t\telse {\n+\t\t\t\tint ch = hex2(cp + 1);\n+\t\t\t\tif (0 <= ch) {\n+\t\t\t\t\tputchar(ch);\n+\t\t\t\t\tcp += 3;\n+\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tputchar(*cp);\n+\t\tcp++;\n+\t}\n+}\n+\n+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)\n+{\n+\tconst char *cp, *sp, *ep;\n+\n+\tfor (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {\n+\t\tstruct atom_value *atomv;\n+\n+\t\tep = strchr(sp, ')');\n+\t\tif (cp < sp)\n+\t\t\temit(cp, sp);\n+\t\tget_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);\n+\t\tprint_value(atomv, quote_style);\n+\t}\n+\tif (*cp) {\n+\t\tsp = cp + strlen(cp);\n+\t\temit(cp, sp);\n+\t}\n+\tif (need_color_reset_at_eol) {\n+\t\tstruct atom_value resetv;\n+\t\tchar color[COLOR_MAXLEN] = \"\";\n+\n+\t\tif (color_parse(\"reset\", color) < 0)\n+\t\t\tdie(\"BUG: couldn't parse 'reset' as a color\");\n+\t\tresetv.s = color;\n+\t\tprint_value(&resetv, quote_style);\n+\t}\n+\tputchar('\\n');\n+}\n+\n+/* If no sorting option is given, use refname to sort as default */\n+struct ref_sorting *ref_default_sorting(void)\n+{\n+\tstatic const char cstr_name[] = \"refname\";\n+\n+\tstruct ref_sorting *sort = xcalloc(1, sizeof(*sort));\n+\n+\tsort->next = NULL;\n+\tsort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n+\treturn sort;\n+}\n+\n+int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n+{\n+\tstruct ref_sorting **sort_tail = opt->value;\n+\tstruct ref_sorting *s;\n+\tint len;\n+\n+\tif (!arg) /* should --no-sort void the list ? */\n+\t\treturn -1;\n+\n+\ts = xcalloc(1, sizeof(*s));\n+\ts->next = *sort_tail;\n+\t*sort_tail = s;\n+\n+\tif (*arg == '-') {\n+\t\ts->reverse = 1;\n+\t\targ++;\n+\t}\n+\tlen = strlen(arg);\n+\ts->atom = parse_ref_filter_atom(arg, arg+len);\n+\treturn 0;\n+}\n-- \n2.4.2\n"},{"id":"263089","messageId":"1433574581-23980-9-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 09/10] for-each-ref: introduce filter_refs()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:40Z","receivedAt":"2015-06-06T07:09:40Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Introduce filter_refs() which will act as an API for users to\ncall and provide a function which will iterate over a set of refs\nwhile filtering out the required refs.\n\nCurrently this will wrap around ref_filter_handler(). Hence,\nref_filter_handler is made file scope static.\n\nHelped-by: Junio C Hamano \nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 2 +-\n ref-filter.c | 12 +++++++++++-\n ref-filter.h | 8 ++++++--\n 3 files changed, 18 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex e237194..2a16947 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -56,7 +56,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \n \tmemset(&ref_cbdata, 0, sizeof(ref_cbdata));\n \tref_cbdata.filter.name_patterns = argv;\n-\tfor_each_rawref(ref_filter_handler, &ref_cbdata);\n+\tfilter_refs(for_each_rawref, &ref_cbdata);\n \n \tref_array_sort(sort, &ref_cbdata.array);\n \ndiff --git a/ref-filter.c b/ref-filter.c\nindex 95e72f6..c32b86f 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -843,7 +843,7 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\n * A call-back given to for_each_ref(). Filter refs and keep them for\n * later object processing.\n */\n-int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n+static int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n {\n \tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n \tstruct ref_filter *filter = &ref_cbdata->filter;\n@@ -889,6 +889,16 @@ void ref_array_clear(struct ref_array *array)\n \tarray->nr = array->alloc = 0;\n }\n \n+/*\n+ * API for filtering a set of refs. The refs are provided and iterated\n+ * over using the for_each_ref_fn(). The refs are stored into and filtered\n+ * based on the ref_filter_cbdata structure.\n+ */\n+int filter_refs(int (for_each_ref_fn)(each_ref_fn, void *), struct ref_filter_cbdata *data)\n+{\n+\treturn for_each_ref_fn(ref_filter_handler, data);\n+}\n+\n static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)\n {\n \tstruct atom_value *va, *vb;\ndiff --git a/ref-filter.h b/ref-filter.h\nindex 1432ff6..15e6766 100644\n--- a/ref-filter.h\n+++ b/ref-filter.h\n@@ -46,8 +46,12 @@ struct ref_filter_cbdata {\n \tstruct ref_filter filter;\n };\n \n-/* Callback function for for_each_*ref(). This filters the refs based on the filters set */\n-int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data);\n+/*\n+ * API for filtering a set of refs. The refs are provided and iterated\n+ * over using the for_each_ref_fn(). The refs are stored into and filtered\n+ * based on the ref_filter_cbdata structure.\n+ */\n+int filter_refs(int (for_each_ref_fn)(each_ref_fn, void *), struct ref_filter_cbdata *data);\n /* Clear all memory allocated to ref_array */\n void ref_array_clear(struct ref_array *array);\n /* Parse format string and sort specifiers */\n-- \n2.4.2\n"},{"id":"263091","messageId":"1433574581-23980-10-git-send-email-karthik.188@gmail.com","threadId":"39541","inReplyTo":"1433574581-23980-1-git-send-email-karthik.188@gmail.com","subject":"[WIP/PATCH v5 10/10] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T07:09:41Z","receivedAt":"2015-06-06T07:09:41Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"This would remove the need of using a pointer to store refname.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n ref-filter.c | 7 ++++---\n ref-filter.h | 2 +-\n 2 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/ref-filter.c b/ref-filter.c\nindex c32b86f..1bd1a28 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -831,8 +831,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\n \t\t\t\t\t\t const unsigned char *objectname,\n \t\t\t\t\t\t int flag)\n {\n-\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));\n-\tref->refname = xstrdup(refname);\n+\tsize_t len = strlen(refname);\n+\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item) + len + 1);\n+\tmemcpy(ref->refname, refname, len);\n+\tref->refname[len] = '\\0';\n \thashcpy(ref->objectname, objectname);\n \tref->flag = flag;\n \n@@ -873,7 +875,6 @@ static int ref_filter_handler(const char *refname, const unsigned char *sha1, in\n static void free_array_item(struct ref_array_item *item)\n {\n \tfree(item->symref);\n-\tfree(item->refname);\n \tfree(item);\n }\n \ndiff --git a/ref-filter.h b/ref-filter.h\nindex 15e6766..041a39a 100644\n--- a/ref-filter.h\n+++ b/ref-filter.h\n@@ -29,7 +29,7 @@ struct ref_array_item {\n \tint flag;\n \tchar *symref;\n \tstruct atom_value *value;\n-\tchar *refname;\n+\tchar refname[FLEX_ARRAY];\n };\n \n struct ref_array {\n-- \n2.4.2\n"},{"id":"263092","messageId":"CAP8UFD0nv8asRtViTgN6QPtupYF-r7KB=3+FMDtCzh7h+asjmA@mail.gmail.com","threadId":"39541","inReplyTo":"55729B78.1070207@gmail.com","subject":"Re: [WIP/PATCH v5 0/10] create ref-filter from for-each-ref","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2015-06-06T09:40:52Z","receivedAt":"2015-06-06T09:40:52Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Sat, Jun 6, 2015 at 9:04 AM, Karthik Nayak wrote:\n> Version for of this patch can be found here :\n> http://www.mail-archive.com/git@vger.kernel.org/msg70280.html\n>\n> Changes in this version:\n> * Rename functions to better suit the code.\n> * implement filter_refs()\n> * use FLEX_ARRAY for refname\n> * other small changes\n\nNow that the patch series starts to be in a good shape you might want\nto use [PATCH ...] instead of [WIP/PATCH ...].\n\nThanks,\nChristian.\n"},{"id":"263093","messageId":"5572D127.6010006@gmail.com","threadId":"39541","inReplyTo":"CAP8UFD0nv8asRtViTgN6QPtupYF-r7KB=3+FMDtCzh7h+asjmA@mail.gmail.com","subject":"Re: [WIP/PATCH v5 0/10] create ref-filter from for-each-ref","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T10:53:27Z","receivedAt":"2015-06-06T10:53:27Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/06/2015 03:10 PM, Christian Couder wrote:\n> On Sat, Jun 6, 2015 at 9:04 AM, Karthik Nayak wrote:\n> > Version for of this patch can be found here :\n> > http://www.mail-archive.com/git@vger.kernel.org/msg70280.html\n> >\n> > Changes in this version:\n> > * Rename functions to better suit the code.\n> > * implement filter_refs()\n> > * use FLEX_ARRAY for refname\n> > * other small changes\n>\n> Now that the patch series starts to be in a good shape you might want\n> to use [PATCH ...] instead of [WIP/PATCH ...].\n>\n> Thanks,\n> Christian.\n>\nGood point! I should have done that.\n\n-- \nRegards,\nKarthik\n"},{"id":"263094","messageId":"5572D8DE.7090007@gmail.com","threadId":"39541","inReplyTo":"55729B78.1070207@gmail.com","subject":"Re: [WIP/PATCH v5 0/10] create ref-filter from for-each-ref","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-06T11:26:22Z","receivedAt":"2015-06-06T11:26:22Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/06/2015 12:34 PM, Karthik Nayak wrote:\n> Version for of this patch can be found here :\n> http://www.mail-archive.com/git@vger.kernel.org/msg70280.html\n>\n> Changes in this version:\n> * Rename functions to better suit the code.\n> * implement filter_refs()\n> * use FLEX_ARRAY for refname\n> * other small changes\n\nI request that this series be ignored, will push again. I hadn't rebased \non master (latest), there'll be merge conflicts.\nSorry for the inconvenience.\n\n-- \nRegards,\nKarthik\n"},{"id":"263213","messageId":"vpqd2168dwa.fsf@anie.imag.fr","threadId":"39541","inReplyTo":"1433574581-23980-2-git-send-email-karthik.188@gmail.com","subject":"Re: [WIP/PATCH v5 02/10] for-each-ref: clean up code","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-08T14:37:25Z","receivedAt":"2015-06-08T14:37:25Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> In 'grab_single_ref()' remove the extra count variable 'cnt' and\n> use the variable 'grab_cnt' of structure 'grab_ref_cbdata' directly\n> instead.\n>\n> Change comment in 'struct ref_sort' to reflect changes in code.\n\nI don't see how the comment change is related to the code change:\n\n> struct ref_sort {\n> \tstruct ref_sort *next;\n> -\tint atom; /* index into used_atom array */\n> +\tint atom; /* index into 'struct atom_value *' array */\n> \tunsigned reverse : 1;\n> };\n> \n> @@ -881,7 +881,6 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n> {\n> \tstruct grab_ref_cbdata *cb = cb_data;\n> \tstruct refinfo *ref;\n> -\tint cnt;\n> \n> \tif (flag & REF_BAD_NAME) {\n> \t\t warning(\"ignoring ref with broken name %s\", refname);\n> @@ -898,10 +897,8 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n> \t */\n> \tref = new_refinfo(refname, sha1, flag);\n> \n> -\tcnt = cb->grab_cnt;\n> -\tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n> -\tcb->grab_array[cnt++] = ref;\n> -\tcb->grab_cnt = cnt;\n> +\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n> +\tcb->grab_array[cb->grab_cnt++] = ref;\n> \treturn 0;\n> }\n\nDid you squash the comment change into the wrong commit?\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263214","messageId":"vpq4mmi8doc.fsf@anie.imag.fr","threadId":"39541","inReplyTo":"1433574581-23980-3-git-send-email-karthik.188@gmail.com","subject":"Re: [WIP/PATCH v5 03/10] for-each-ref: rename 'refinfo' to 'ref_array_item'","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-08T14:42:11Z","receivedAt":"2015-06-08T14:42:11Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> Make 'symref' a non const char pointer, so that the compiler doesn't\n> throw an error when we try to free the memory allocated to it.\n\nCasting to non-cost when calling free() is a common pattern. I think it\nwould make more sense to cast at free() time and keep the member const.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263215","messageId":"vpqvbey6yli.fsf@anie.imag.fr","threadId":"39541","inReplyTo":"1433574581-23980-5-git-send-email-karthik.188@gmail.com","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-08T14:53:13Z","receivedAt":"2015-06-08T14:53:13Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> +/* Free all memory allocated for ref_array */\n> +void ref_array_clear(struct ref_array *array)\n\nIs this a private function? If so, then add static. If not, you probably\nwant to export it in a .h file.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263223","messageId":"5575B24A.8040004@gmail.com","threadId":"39541","inReplyTo":"vpqvbey6yli.fsf@anie.imag.fr","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-08T15:18:34Z","receivedAt":"2015-06-08T15:18:34Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/08/2015 08:23 PM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n> > +/* Free all memory allocated for ref_array */\n> > +void ref_array_clear(struct ref_array *array)\n>\n> Is this a private function? If so, then add static. If not, you probably\n> want to export it in a .h file.\n>\nIt is in ref-filter.h.\n\n-- \nRegards,\nKarthik\n"},{"id":"263224","messageId":"5575B25A.6020608@gmail.com","threadId":"39541","inReplyTo":"vpqvbey6yli.fsf@anie.imag.fr","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-08T15:18:50Z","receivedAt":"2015-06-08T15:18:50Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/08/2015 08:23 PM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n> > +/* Free all memory allocated for ref_array */\n> > +void ref_array_clear(struct ref_array *array)\n>\n> Is this a private function? If so, then add static. If not, you probably\n> want to export it in a .h file.\n>\nIt is in ref-filter.h.\n\n-- \nRegards,\nKarthik\n"},{"id":"263225","messageId":"5575B276.7030005@gmail.com","threadId":"39541","inReplyTo":"vpq4mmi8doc.fsf@anie.imag.fr","subject":"Re: [WIP/PATCH v5 03/10] for-each-ref: rename 'refinfo' to 'ref_array_item'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-08T15:19:18Z","receivedAt":"2015-06-08T15:19:18Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/08/2015 08:12 PM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n>> Make 'symref' a non const char pointer, so that the compiler doesn't\n>> throw an error when we try to free the memory allocated to it.\n>\n> Casting to non-cost when calling free() is a common pattern. I think it\n> would make more sense to cast at free() time and keep the member const.\n>\n\nOk! will do that. thanks :)\n\n-- \nRegards,\nKarthik\n"},{"id":"263227","messageId":"5575B30B.6000407@gmail.com","threadId":"39541","inReplyTo":"vpqd2168dwa.fsf@anie.imag.fr","subject":"Re: [WIP/PATCH v5 02/10] for-each-ref: clean up code","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-08T15:21:47Z","receivedAt":"2015-06-08T15:21:47Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/08/2015 08:07 PM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n>> In 'grab_single_ref()' remove the extra count variable 'cnt' and\n>> use the variable 'grab_cnt' of structure 'grab_ref_cbdata' directly\n>> instead.\n>>\n>> Change comment in 'struct ref_sort' to reflect changes in code.\n>\n> I don't see how the comment change is related to the code change:\n>\n>> struct ref_sort {\n>> \tstruct ref_sort *next;\n>> -\tint atom; /* index into used_atom array */\n>> +\tint atom; /* index into 'struct atom_value *' array */\n>> \tunsigned reverse : 1;\n>> };\n>>\n>> @@ -881,7 +881,6 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n>> {\n>> \tstruct grab_ref_cbdata *cb = cb_data;\n>> \tstruct refinfo *ref;\n>> -\tint cnt;\n>>\n>> \tif (flag & REF_BAD_NAME) {\n>> \t\t warning(\"ignoring ref with broken name %s\", refname);\n>> @@ -898,10 +897,8 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n>> \t */\n>> \tref = new_refinfo(refname, sha1, flag);\n>>\n>> -\tcnt = cb->grab_cnt;\n>> -\tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n>> -\tcb->grab_array[cnt++] = ref;\n>> -\tcb->grab_cnt = cnt;\n>> +\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n>> +\tcb->grab_array[cb->grab_cnt++] = ref;\n>> \treturn 0;\n>> }\n>\n> Did you squash the comment change into the wrong commit?\n>\n\nWhat I meant was, change the comment to reflect changes in code since \nthe comment was made, not relevant to the simplification of code.\n\nI put these two together as they are trivial changes.\nEither I could reword the commit message or split the commit.\n\n-- \nRegards,\nKarthik\n"},{"id":"263244","messageId":"vpqfv622mpd.fsf@anie.imag.fr","threadId":"39541","inReplyTo":"5575B30B.6000407@gmail.com","subject":"Re: [WIP/PATCH v5 02/10] for-each-ref: clean up code","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-08T16:23:42Z","receivedAt":"2015-06-08T16:23:42Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> I put these two together as they are trivial changes.\n> Either I could reword the commit message or split the commit.\n\nI'd split the commit. Actually, even though it's only a small comment\nchange, it's not so \"trivial\" in the sense that one needs a good\nunderstanding of the code to check the correctness of your patch.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263245","messageId":"vpqbngq2mkw.fsf@anie.imag.fr","threadId":"39541","inReplyTo":"5575B25A.6020608@gmail.com","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-08T16:26:23Z","receivedAt":"2015-06-08T16:26:23Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> On 06/08/2015 08:23 PM, Matthieu Moy wrote:\n>> Karthik Nayak writes:\n>>\n>> > +/* Free all memory allocated for ref_array */\n>> > +void ref_array_clear(struct ref_array *array)\n>>\n>> Is this a private function? If so, then add static. If not, you probably\n>> want to export it in a .h file.\n>>\n> It is in ref-filter.h.\n\nAh, OK. It comes later in the series.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263258","messageId":"xmqq3822cer4.fsf@gitster.dls.corp.google.com","threadId":"39541","inReplyTo":"vpqbngq2mkw.fsf@anie.imag.fr","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-08T17:05:19Z","receivedAt":"2015-06-08T17:05:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> Karthik Nayak writes:\n>\n>> On 06/08/2015 08:23 PM, Matthieu Moy wrote:\n>>> Karthik Nayak writes:\n>>>\n>>> > +/* Free all memory allocated for ref_array */\n>>> > +void ref_array_clear(struct ref_array *array)\n>>>\n>>> Is this a private function? If so, then add static. If not, you probably\n>>> want to export it in a .h file.\n>>>\n>> It is in ref-filter.h.\n>\n> Ah, OK. It comes later in the series.\n\nConfused I am; if it comes later not in the same patch then it is\nnot OK, is it?\n"},{"id":"263266","messageId":"vpqa8wat8u9.fsf@anie.imag.fr","threadId":"39541","inReplyTo":"xmqq3822cer4.fsf@gitster.dls.corp.google.com","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-08T17:21:02Z","receivedAt":"2015-06-08T17:21:02Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Junio C Hamano writes:\n\n> Matthieu Moy writes:\n>\n>> Karthik Nayak writes:\n>>\n>>> On 06/08/2015 08:23 PM, Matthieu Moy wrote:\n>>>> Karthik Nayak writes:\n>>>>\n>>>> > +/* Free all memory allocated for ref_array */\n>>>> > +void ref_array_clear(struct ref_array *array)\n>>>>\n>>>> Is this a private function? If so, then add static. If not, you probably\n>>>> want to export it in a .h file.\n>>>>\n>>> It is in ref-filter.h.\n>>\n>> Ah, OK. It comes later in the series.\n>\n> Confused I am; if it comes later not in the same patch then it is\n> not OK, is it?\n\nWe could introduce ref-filter.h earlier, indeed. To me, the current\nsolution is good enough, but introducing ref-filter.h early and adding\nfunction definition there in the same commit as you drop the \"static\"\nkeyword for them would clearly be an improvement.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263300","messageId":"5575F8CB.8080009@gmail.com","threadId":"39541","inReplyTo":"vpqa8wat8u9.fsf@anie.imag.fr","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-08T20:19:23Z","receivedAt":"2015-06-08T20:19:23Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/08/2015 10:51 PM, Matthieu Moy wrote:\n> Junio C Hamano writes:\n>\n>> Matthieu Moy writes:\n>>\n>>> Karthik Nayak writes:\n>>>\n>>>> On 06/08/2015 08:23 PM, Matthieu Moy wrote:\n>>>>> Karthik Nayak writes:\n>>>>>\n>>>>>> +/* Free all memory allocated for ref_array */\n>>>>>> +void ref_array_clear(struct ref_array *array)\n>>>>>\n>>>>> Is this a private function? If so, then add static. If not, you probably\n>>>>> want to export it in a .h file.\n>>>>>\n>>>> It is in ref-filter.h.\n>>>\n>>> Ah, OK. It comes later in the series.\n>>\n>> Confused I am; if it comes later not in the same patch then it is\n>> not OK, is it?\n>\n> We could introduce ref-filter.h earlier, indeed. To me, the current\n> solution is good enough, but introducing ref-filter.h early and adding\n> function definition there in the same commit as you drop the \"static\"\n> keyword for them would clearly be an improvement.\n>\n\nBut that would break the flow, wouldn't it? I wanted ref-filter to be \nintroduced together, hence right after ref-filter.h we move code to\nref-filter.c\n\n-- \nRegards,\nKarthik\n"},{"id":"263323","messageId":"vpq1thlmlzg.fsf@anie.imag.fr","threadId":"39541","inReplyTo":"5575F8CB.8080009@gmail.com","subject":"Re: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-09T06:31:15Z","receivedAt":"2015-06-09T06:31:15Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> On 06/08/2015 10:51 PM, Matthieu Moy wrote:\n\n>> We could introduce ref-filter.h earlier, indeed. To me, the current\n>> solution is good enough, but introducing ref-filter.h early and adding\n>> function definition there in the same commit as you drop the \"static\"\n>> keyword for them would clearly be an improvement.\n>\n> But that would break the flow, wouldn't it? I wanted ref-filter to be\n> introduced together, hence right after ref-filter.h we move code to\n> ref-filter.c\n\nThat's why I find the current solution good enough: it also has\nadvantages. But in the current series, when you say \"make functions\npublic\", you are not actually doing so since they're not exported in a\n.h file.\n\nConversely, PATCH 07 does two things: move code from for-each-ref.c and\nintroduce new declarations. Had you introduced these declarations\nearlier, this patch would have been pure code movement.\n\nIn both cases, you have intermediate states that are not fully\nconsistant: either you have public functions in the builtin/ directory\n(which sometimes happen in Git's codebase, but we try to avoid it), or\nyou have non-static functions that are not declared in a .h.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}