From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.2 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 8D97F1F404 for ; Fri, 20 Apr 2018 22:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752744AbeDTWVZ (ORCPT ); Fri, 20 Apr 2018 18:21:25 -0400 Received: from mout.gmx.net ([212.227.17.22]:33501 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751695AbeDTWVZ (ORCPT ); Fri, 20 Apr 2018 18:21:25 -0400 Received: from [192.168.0.129] ([37.201.195.116]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MBq8p-1fJEVq0Whz-00Anp4; Sat, 21 Apr 2018 00:21:21 +0200 Date: Sat, 21 Apr 2018 00:21:05 +0200 (DST) From: Johannes Schindelin X-X-Sender: virtualbox@MININT-6BKU6QN.europe.corp.microsoft.com To: git@vger.kernel.org cc: Junio C Hamano , Jakub Narebski , Stefan Beller , Eric Sunshine , Stefan Beller , Christian Couder Subject: [PATCH v3 02/11] commit: Let the callback of for_each_mergetag return on error In-Reply-To: Message-ID: <4593996360eb12da218bc73745298a68bd71ab20.1524262793.git.johannes.schindelin@gmx.de> References: User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K1:Hi7WxBV62gwRn2gwe3hwb1abyXl+V1nnIrg3rIf+UEHg0rIhFxI H6iHGYn3hWMM2uMom1I5xCA/1+PPPIqf1o8WJiLJTp4gYrS9oJ6XRVFKL/zVXQPDcDbk+2E sPKVzH+xPbJ6olNeKt4vL0WgorvJzX6YdfhMztfDQOZrBydEAtxJeR0Ec76J1z1y3zJnIRY LoCJmriIvyPSrjGYQL3tg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Ebl74R17SvM=:rsTxhDlq3qLLVV6WYmiIgG XH4H/sd+k6Z6BispgcL9sCQajHMfUa41fELJJoMkp8maNX43hV3qQ1Dw9Balaljb4Pkh52NT6 I2FgP6sVMAp6vp/Rihda1uShgaJTS0DQBPoj5lz1X24L0Jgh/vOwv0SvV7FDn08IBOR/Ae1Tw LuH2W1CuvGZ5aavSX/OOK63zvCQ8A2tzH38bE21gzZrTCtQx/ee4C5TXo2ATIgmsEu/exq2Oc /0pq3ojBV1TVEhTCpZcVIThskO0LOy2mj7PNBPBQav8IQgA8qKQT1j2UkMzpWN0o6/s5T329V wKvBp2PPP/8/3gVdxUe5qErG4ADNeqfXXk7jvXS0gfdaV9HFchPVKLANcij2QIu1UVsvDAJfM fLT7745722X5A+Rh0mPalKh9uA8Cf1o4kal47ftMGAC6J4gqTdk2uJu82nxkoHuPwumZ4vzWp PKOnhiy8fvQU+WBSSiLkMQOitP939GTMCoWhqxiieKcBJ0HpL7w8TlG7cuAqaH8HABAy3SO05 WGJ2XJK9bLlBxhRnLWf0m9HtyKUcf9PVzLOYiF2Um5t21WJL67l6bv4MyoHS46G3JgKYMdtKy E4RBQurg8WIsn48py/3SaBJl8WaGINZJ2sck56AoMhHzJmHbWycYJ2SP3lb0I0J6eEa84kyp2 P6nM6mAHso4ddlO8QgGoflydhSoxkuYkLTAzytCfLxFCAJiuVcgFoFhmGxhaGPa5Dm4h5ovms 1IaCBZTybZ1ILXsuvhCHc7qZOKz8oXKjHu/XIjaw1WmNvRFOaorlzEYUcA2SwJ8Td4mE3BhJr ptIF7GnyO2DsBy+WB+NpDqDYeA5/0k7NHTjEBKopN4LIcS2fjQ= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- builtin/replace.c | 8 ++++---- commit.c | 8 +++++--- commit.h | 4 ++-- log-tree.c | 13 +++++++------ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 935647be6bd..245d3f4164e 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -345,7 +345,7 @@ struct check_mergetag_data { const char **argv; }; -static void check_one_mergetag(struct commit *commit, +static int check_one_mergetag(struct commit *commit, struct commit_extra_header *extra, void *data) { @@ -368,20 +368,20 @@ static void check_one_mergetag(struct commit *commit, if (get_oid(mergetag_data->argv[i], &oid) < 0) die(_("Not a valid object name: '%s'"), mergetag_data->argv[i]); if (!oidcmp(&tag->tagged->oid, &oid)) - return; /* found */ + return 0; /* found */ } die(_("original commit '%s' contains mergetag '%s' that is discarded; " "use --edit instead of --graft"), ref, oid_to_hex(&tag_oid)); } -static void check_mergetags(struct commit *commit, int argc, const char **argv) +static int check_mergetags(struct commit *commit, int argc, const char **argv) { struct check_mergetag_data mergetag_data; mergetag_data.argc = argc; mergetag_data.argv = argv; - for_each_mergetag(check_one_mergetag, commit, &mergetag_data); + return for_each_mergetag(check_one_mergetag, commit, &mergetag_data); } static int create_graft(int argc, const char **argv, int force) diff --git a/commit.c b/commit.c index ca474a7c112..2952ec987c5 100644 --- a/commit.c +++ b/commit.c @@ -1288,17 +1288,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) +int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data) { struct commit_extra_header *extra, *to_free; + int res = 0; to_free = read_commit_extra_headers(commit, NULL); - for (extra = to_free; extra; extra = extra->next) { + for (extra = to_free; !res && extra; extra = extra->next) { if (strcmp(extra->key, "mergetag")) continue; /* not a merge tag */ - fn(commit, extra, data); + res = fn(commit, extra, data); } free_commit_extra_headers(to_free); + return res; } static inline int standard_header_field(const char *field, size_t len) diff --git a/commit.h b/commit.h index 0fb8271665c..9000895ad91 100644 --- a/commit.h +++ b/commit.h @@ -291,10 +291,10 @@ extern const char *find_commit_header(const char *msg, const char *key, /* Find the end of the log message, the right place for a new trailer. */ extern int ignore_non_trailer(const char *buf, size_t len); -typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra, +typedef int (*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); +extern int 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 */ diff --git a/log-tree.c b/log-tree.c index d1c0bedf244..f3a51a6e726 100644 --- a/log-tree.c +++ b/log-tree.c @@ -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) -- 2.17.0.windows.1.15.gaa56ade3205