Skip to content

Commit

Permalink
commit: add for_each_mergetag()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christian Couder authored and Junio C Hamano committed Jul 7, 2014
1 parent 6f92e5f commit 063da62
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
13 changes: 13 additions & 0 deletions commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,19 @@ struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
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)) ||
Expand Down
5 changes: 5 additions & 0 deletions commit.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

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;
Expand Down
15 changes: 4 additions & 11 deletions log-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,11 @@ static int is_common_merge(const struct commit *commit)
&& !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 *commit)
void *data)
{
struct rev_info *opt = (struct rev_info *)data;
unsigned char sha1[20];
struct tag *tag;
struct strbuf verify_message;
Expand Down Expand Up @@ -463,15 +464,7 @@ static void show_one_mergetag(struct rev_info *opt,

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)
Expand Down

0 comments on commit 063da62

Please sign in to comment.