commit: add for_each_mergetag()

In the same way as there is for_each_ref() to iterate on refs,
for_each_mergetag() allows the caller to iterate on the mergetags of
a given commit.  Use it to rewrite show_mergetag() used in "git log".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit.c b/commit.c
index 4ff8077dbfbc6cdd6c14728a3d33a78d075c236f..94b1af9392bcfee0e6a6127e4da530531671b711 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1316,6 +1316,19 @@ struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
        return extra;
 }
 
        return extra;
 }
 

+void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
+{
+       struct commit_extra_header *extra, *to_free;
+
+       to_free = read_commit_extra_headers(commit, NULL);
+       for (extra = to_free; extra; extra = extra->next) {
+               if (strcmp(extra->key, "mergetag"))
+                       continue; /* not a merge tag */
+               fn(commit, extra, data);
+       }
+       free_commit_extra_headers(to_free);
+}
+

 static inline int standard_header_field(const char *field, size_t len)
 {
        return ((len == 4 && !memcmp(field, "tree ", 5)) ||
 static inline int standard_header_field(const char *field, size_t len)
 {
        return ((len == 4 && !memcmp(field, "tree ", 5)) ||

diff --git a/commit.h b/commit.h
index 2e1492a6e4d1c5fc5bea3a48180f128601c3461e..b695aa4a5bfc7917da1cd3e00a295439fe905020 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -312,6 +312,11 @@ extern struct commit_extra_header *read_commit_extra_headers(struct commit *, co
 
 extern void free_commit_extra_headers(struct commit_extra_header *extra);
 
 
 extern void free_commit_extra_headers(struct commit_extra_header *extra);
 

+typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
+                                void *cb_data);
+
+extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
+

 struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */
        const char *name;
 struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */
        const char *name;

diff --git a/log-tree.c b/log-tree.c
index 10e68442b35c9bd9ca1c00c52609a4827b8bace5..706ed4c250814bba867986fadbf378c10c99da33 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -413,10 +413,11 @@ static int is_common_merge(const struct commit *commit)
                && !commit->parents->next->next);
 }
 
                && !commit->parents->next->next);
 }
 

-static void show_one_mergetag(struct rev_info *opt,
+static void show_one_mergetag(struct commit *commit,

                              struct commit_extra_header *extra,
                              struct commit_extra_header *extra,

-                             struct commit *commit)
+                             void *data)

 {
 {

+       struct rev_info *opt = (struct rev_info *)data;

        unsigned char sha1[20];
        struct tag *tag;
        struct strbuf verify_message;
        unsigned char sha1[20];
        struct tag *tag;
        struct strbuf verify_message;


@@ -463,15 +464,7 @@ static void show_one_mergetag(struct rev_info *opt,
 
 static void show_mergetag(struct rev_info *opt, struct commit *commit)
 {
 
 static void show_mergetag(struct rev_info *opt, struct commit *commit)
 {

-       struct commit_extra_header *extra, *to_free;
-
-       to_free = read_commit_extra_headers(commit, NULL);
-       for (extra = to_free; extra; extra = extra->next) {
-               if (strcmp(extra->key, "mergetag"))
-                       continue; /* not a merge tag */
-               show_one_mergetag(opt, extra, commit);
-       }
-       free_commit_extra_headers(to_free);
+       for_each_mergetag(show_one_mergetag, commit, opt);

 }
 
 void show_log(struct rev_info *opt)
 }
 
 void show_log(struct rev_info *opt)