summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-21 11:17:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-21 11:17:45 -0700
commitdadb89d92ce9c81846c1b4c743a41b6e845b572c (patch)
tree68ac1de1b3aaa912b83ff39d084f39ed8a07ea22 /log-tree.c
parentda33a97998f6d6206c08bd72a527f5b8e6e26d33 (diff)
parent063da62b02aeafe58fdacce0ea48c0761b06df60 (diff)
downloadgit-dadb89d92ce9c81846c1b4c743a41b6e845b572c.tar.gz
Merge branch 'cc/for-each-mergetag'
* cc/for-each-mergetag: commit: add for_each_mergetag()
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/log-tree.c b/log-tree.c
index f87b7e891a..0c53dc11ab 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -414,10 +414,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;
@@ -465,15 +466,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)