mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: Let the callback of for_each_mergetag return on error

Browse Source 
This is yet another patch to be filed under the keyword "libification".

There is one subtle change in behavior here, where a `git log` that has
been asked to show the mergetags would now stop reporting the mergetags
upon the first failure, whereas previously, it would have continued to the
next mergetag, if any.

In practice, that change should not matter, as it is 1) uncommon to
perform octopus merges using multiple tags as merge heads, and 2) when the
user asks to be shown those tags, they really should be there.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2018-04-25 11:54:04 +02:00
committed by Junio C Hamano
parent c5aa6db64f
commit fef461ea5d
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
log-tree.c
View File

@ -488,9 +488,9 @@ static int is_common_merge(const struct commit *commit)
&& !commit->parents->next->next);
}
static void show_one_mergetag(struct commit *commit,
struct commit_extra_header *extra,
void *data)
static int show_one_mergetag(struct commit *commit,
struct commit_extra_header *extra,
void *data)
{
struct rev_info *opt = (struct rev_info *)data;
struct object_id oid;
@ -502,7 +502,7 @@ static void show_one_mergetag(struct commit *commit,
hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid);
tag = lookup_tag(&oid);
if (!tag)
return; /* error message already given */
return -1; /* error message already given */
strbuf_init(&verify_message, 256);
if (parse_tag_buffer(tag, extra->value, extra->len))
@ -536,11 +536,12 @@ static void show_one_mergetag(struct commit *commit,
show_sig_lines(opt, status, verify_message.buf);
strbuf_release(&verify_message);
return 0;
}
static void show_mergetag(struct rev_info *opt, struct commit *commit)
static int show_mergetag(struct rev_info *opt, struct commit *commit)
{
for_each_mergetag(show_one_mergetag, commit, opt);
return for_each_mergetag(show_one_mergetag, commit, opt);
}
void show_log(struct rev_info *opt)