undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cc/for-each-mergetag'

Browse Source 
* cc/for-each-mergetag:
  commit: add for_each_mergetag()
This commit is contained in:
Junio C Hamano 2014-07-21 11:17:45 -07:00
commit dadb89d92c
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commit.c
View File

@ -1310,6 +1310,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) static inline int standard_header_field(const char *field, size_t len)
{ {
return ((len == 4 && !memcmp(field, "tree ", 5)) || return ((len == 4 && !memcmp(field, "tree ", 5)) ||

5
commit.h
View File

@ -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 merge_remote_desc {
struct object *obj; /* the named object, could be a tag */ struct object *obj; /* the named object, could be a tag */
const char *name; const char *name;

15
log-tree.c
View File

@ -414,10 +414,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]; unsigned char sha1[20];
struct tag *tag; struct tag *tag;
struct strbuf verify_message; 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) static void show_mergetag(struct rev_info *opt, struct commit *commit)
{ {
struct commit_extra_header *extra, *to_free; for_each_mergetag(show_one_mergetag, commit, opt);
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);
} }
void show_log(struct rev_info *opt) void show_log(struct rev_info *opt)