From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id EAEC71F9FD for ; Thu, 4 Mar 2021 12:50:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232284AbhCDMty (ORCPT ); Thu, 4 Mar 2021 07:49:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231865AbhCDMtr (ORCPT ); Thu, 4 Mar 2021 07:49:47 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A829C061756 for ; Thu, 4 Mar 2021 04:49:07 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id r5so18842186pfh.13 for ; Thu, 04 Mar 2021 04:49:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=VJSGqmdrvliOruCDCVOvd6WNfW/h3dc4t2sZfDQKwew=; b=pO7WjoXgFphjBFRQ+egJ4JwpIpt2ardrW6+STWyUvAwUS0aO1197A/Bpuq8S5RU8B3 dSeFNjAjBZUB5V7s0zSbB2i63PNoDbq0gE6SDFlyzQqsi18aRe13hVekjxJrVdMS6zy9 g4481A5e6eqFfkUdGL87D87tTVQ2Z2RBTcILpwzaZobH34x52jkD1ljAqr/7zIrNMJXH FMJJmpoekdWb+XS0xI2niRvHUv/QZIMqZfKS1795Tq6zOf3ctUgCPpTnEBfBXcIPCD6p swbLr7k1X7u69ip/v4eJxfWVG5vcgHEeBI72VbPKxS84dJdI+x5RhG6ctgkLChbEIzVu CBEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=VJSGqmdrvliOruCDCVOvd6WNfW/h3dc4t2sZfDQKwew=; b=Fr8sOz0bIRUy7jaN/dvxaLg7IZ2qYc81NCkejYqWV5QmPqnLFd9zJrmkCENF6LnWoz HNT8QpuHoC8wYk8iVJhc9F4JgSUD8PgKWgOfO5VS2IQTALcl0WtZA4/9WFpMpjrrJzY8 2MK233mb/6SLATQT2RPNhs3rMWLt/rRAJzALSGA5GHw8Sqkc1izk6ALE0vkIxK90TLTM frifJfCY5nIjddkHmuhvqmOyukFq7QI2rqC2BTLBdkrlNYNf6o85mCtBZkxEQmmKat3R LDz6mT3FVBq4aIjRf0Xct0YzYq0zi3CxhFNKybj17RNkPUJ4iRcpW+Tf9EGkGSde/9fG gGVg== X-Gm-Message-State: AOAM532q+eVv1EkdQj1SlA/3FUe0KCTpmhcYFcZRBQAEVxMFj4ggWwIQ Ihdf4MuAQs6pUDq65Z4kb/M= X-Google-Smtp-Source: ABdhPJzVsRiYXTWqgZ5htZOUld3fkemnqxD91/9oSmEPx5D2e296fkDUFnbnmiB7b50/XsfqnN+qzg== X-Received: by 2002:aa7:9010:0:b029:1ee:253b:ebca with SMTP id m16-20020aa790100000b02901ee253bebcamr3670457pfo.53.1614862146585; Thu, 04 Mar 2021 04:49:06 -0800 (PST) Received: from generichostname ([172.92.165.181]) by smtp.gmail.com with ESMTPSA id i7sm9939313pjs.1.2021.03.04.04.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 04:49:06 -0800 (PST) Date: Thu, 4 Mar 2021 04:49:04 -0800 From: Denton Liu To: ZheNing Hu via GitGitGadget Cc: git@vger.kernel.org, Junio C Hamano , Eric Sunshine , ZheNing Hu Subject: Re: [PATCH v3] format-patch: allow a non-integral version numbers Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi ZheNing, On Thu, Mar 04, 2021 at 12:12:06PM +0000, ZheNing Hu via GitGitGadget wrote: > From: ZheNing Hu > > Usually we can only use `format-patch -v` to generate integral > version numbers patches, but sometimes a same fixup should be > labeled as a non-integral versions like `v1.1`, so teach `format-patch` s/versions/version/ > to allow a non-integral versions may be helpful to send those patches. s/may be/which &/ > > Since the original `format-patch` logic, if we specify a version `-v` > and commbine with `--interdiff` or `--rangediff`, the patch will output > "Interdiff again v:" or "Range-diff again v:`, but this does > not meet the requirements of our fractional version numbers, so if the > user use a integral version number `-v`, ensure that the output in > the patch is still `v`; otherwise, only output "Interdiff" or > "Range-diff". > > Signed-off-by: ZheNing Hu > --- > [GSOC] format-patch: allow a non-integral version numbers > > There is a small question: in the case of --reroll-count=, "n" is an > integer, we output "n-1" in the patch instead of "m" specified by > --previous-count=,Should we switch the priority of these two: let "m" > output? > > this want to fix #882 Thanks. > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-885%2Fadlternative%2Fformat_patch_non_intergral-v3 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-885/adlternative/format_patch_non_intergral-v3 > Pull-Request: https://github.com/gitgitgadget/git/pull/885 > > Range-diff vs v2: > > 1: 800094cbf53b ! 1: d4f38b78c464 format-patch: allow a non-integral version numbers > @@ Commit message > > Usually we can only use `format-patch -v` to generate integral > version numbers patches, but sometimes a same fixup should be > - laveled as a non-integral versions like `v1.1`,so teach format-patch > - allow a non-integral versions may be helpful to send those patches. > + labeled as a non-integral versions like `v1.1`, so teach `format-patch` > + to allow a non-integral versions may be helpful to send those patches. > > Since the original `format-patch` logic, if we specify a version `-v` > and commbine with `--interdiff` or `--rangediff`, the patch will output > "Interdiff again v:" or "Range-diff again v:`, but this does > - not meet the requirements of our fractional version numbers, so provide > - `format patch` a new option `--previous-count=`, the patch can output > - user-specified previous version number. If the user use a integral version > - number `-v`, ensure that the output in the patch is still `v`. > - (let `--previous-count` become invalid.) > + not meet the requirements of our fractional version numbers, so if the > + user use a integral version number `-v`, ensure that the output in > + the patch is still `v`; otherwise, only output "Interdiff" or > + "Range-diff". > > Signed-off-by: ZheNing Hu > > ## Documentation/git-format-patch.txt ## > -@@ Documentation/git-format-patch.txt: SYNOPSIS > - [--cover-from-description=] > - [--rfc] [--subject-prefix=] > - [(--reroll-count|-v) ] > -+ [--previous-count=] > - [--to=] [--cc=] > - [--[no-]cover-letter] [--quiet] > - [--[no-]encode-email-headers] > @@ Documentation/git-format-patch.txt: populated with placeholder text. > `--subject-prefix` option) has ` v` appended to it. E.g. > `--reroll-count=4` may produce `v4-0001-add-makefile.patch` > file that has "Subject: [PATCH v4 1/20] Add makefile" in it. > + now can support non-integrated version number like `-v1.1`. > -+ > -+--previous-count=:: > -+ Under the premise that we have used `--reroll-count=`, > -+ we can use `--previous-count=` to specify the previous > -+ version number. E.g. When we use the `--range-diff` or > -+ `--interdiff` option and combine with `-v2.3 --previous-count=2.2`, > -+ "Interdiff against v2.2:" or "Range-diff against v2.2:" > -+ will be output in the patch. > > --to=:: > Add a `To:` header to the email headers. This is in addition > @@ builtin/log.c: static void print_bases(struct base_tree_info *bases, FILE *file) > > -static const char *diff_title(struct strbuf *sb, int reroll_count, > - const char *generic, const char *rerolled) > -+static const char *diff_title(struct strbuf *sb, const char *reroll_count, int reroll_count_is_integer, > -+ const char*previous_count, const char *generic, const char *rerolled) > ++static const char *diff_title(struct strbuf *sb, > ++ const char *reroll_count_string, > ++ const char*previous_count_string, > ++ const char *generic, const char *rerolled) > { > - if (reroll_count <= 0) > -+ if (!reroll_count || (!reroll_count_is_integer && !previous_count)) > ++ if (!reroll_count_string || !previous_count_string) > strbuf_addstr(sb, generic); > - else /* RFC may be v0, so allow -v1 to diff against v0 */ > - strbuf_addf(sb, rerolled, reroll_count - 1); > -+ else if (reroll_count_is_integer)/* RFC may be v0, so allow -v1 to diff against v0 */ > -+ strbuf_addf(sb, rerolled, atoi(reroll_count) - 1); > -+ else if (previous_count) > -+ strbuf_addf(sb, rerolled, previous_count); > ++ else if (previous_count_string) > ++ strbuf_addf(sb, rerolled, previous_count_string); > return sb->buf; > } > > @@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *prefix) > - struct strbuf buf = STRBUF_INIT; > int use_patch_format = 0; > int quiet = 0; > -- int reroll_count = -1; > -+ int reroll_count_is_integer = 0; > -+ const char *reroll_count = NULL; > -+ const char *previous_count = NULL; > + int reroll_count = -1; > ++ const char *reroll_count_string = NULL; > ++ const char *previous_count_string = NULL; > char *cover_from_description_arg = NULL; > char *branch_name = NULL; > char *base_commit = NULL; > @@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *pre > N_("start numbering patches at instead of 1")), > - OPT_INTEGER('v', "reroll-count", &reroll_count, > - N_("mark the series as Nth re-roll")), > -+ OPT_STRING('v', "reroll-count", &reroll_count, N_("reroll-count"), > ++ OPT_STRING('v', "reroll-count", &reroll_count_string, N_("reroll-count"), > + N_("mark the series as specified version re-roll")), > -+ OPT_STRING(0, "previous-count", &previous_count, N_("previous-count"), > -+ N_("specified as the last version while we use --reroll-count")), > OPT_INTEGER(0, "filename-max-length", &fmt_patch_name_max, > N_("max length of output filename")), > OPT_CALLBACK_F(0, "rfc", &rev, NULL, > @@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *prefix) > - > if (cover_from_description_arg) > cover_from_description_mode = parse_cover_from_description(cover_from_description_arg); > -- > + > - if (0 < reroll_count) { > -+ if (previous_count && !reroll_count) > -+ usage(_("previous-count can only used when reroll-count is used")); > -+ if (reroll_count) { > ++ if (reroll_count_string) { > struct strbuf sprefix = STRBUF_INIT; > - strbuf_addf(&sprefix, "%s v%d", > -+ char ch; > -+ size_t i = 0 , reroll_count_len = strlen(reroll_count); > +- rev.subject_prefix, reroll_count); > +- rev.reroll_count = reroll_count; > ++ char *endp; > + > -+ for (; i != reroll_count_len; i++) { > -+ ch = reroll_count[i]; > -+ if(!isdigit(ch)) > -+ break; > ++ reroll_count = strtoul(reroll_count_string, &endp, 10); > ++ if (!*endp && 0 < reroll_count) { > ++ previous_count_string = xstrfmt("%d", reroll_count - 1); > + } > -+ reroll_count_is_integer = i == reroll_count_len ? 1 : 0; > + strbuf_addf(&sprefix, "%s v%s", > - rev.subject_prefix, reroll_count); > - rev.reroll_count = reroll_count; > ++ rev.subject_prefix, reroll_count_string); > ++ rev.reroll_count = reroll_count_string; > rev.subject_prefix = strbuf_detach(&sprefix, NULL); > + } > + > @@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *prefix) > + die(_("--interdiff requires --cover-letter or single patch")); > rev.idiff_oid1 = &idiff_prev.oid[idiff_prev.nr - 1]; > rev.idiff_oid2 = get_commit_tree_oid(list[0]); > - rev.idiff_title = diff_title(&idiff_title, reroll_count, > +- rev.idiff_title = diff_title(&idiff_title, reroll_count, > - _("Interdiff:"), > - _("Interdiff against v%d:")); > -+ reroll_count_is_integer, previous_count, _("Interdiff:"), > -+ reroll_count_is_integer ? _("Interdiff against v%d:") : > ++ rev.idiff_title = diff_title(&idiff_title, reroll_count_string, > ++ previous_count_string, > ++ _("Interdiff:"), > + _("Interdiff against v%s:")); > } > > if (creation_factor < 0) > @@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *prefix) > + rev.rdiff1 = rdiff1.buf; > rev.rdiff2 = rdiff2.buf; > rev.creation_factor = creation_factor; > - rev.rdiff_title = diff_title(&rdiff_title, reroll_count, > +- rev.rdiff_title = diff_title(&rdiff_title, reroll_count, > - _("Range-diff:"), > - _("Range-diff against v%d:")); > -+ reroll_count_is_integer, previous_count, _("Range-diff:"), > -+ reroll_count_is_integer ? _("Range-diff against v%d:") : > ++ rev.rdiff_title = diff_title(&rdiff_title, reroll_count_string, > ++ previous_count_string, > ++ _("Range-diff:"), > + _("Range-diff against v%s:")); > } > > @@ t/t3206-range-diff.sh: test_expect_success 'format-patch --range-diff as comment > grep "> 1: .* new message" 0001-* > ' > > -+test_expect_success 'format-patch --range-diff reroll-count with a non-integer and previous-count ' ' > -+ git format-patch --range-diff=HEAD~1 -v2.9 --previous-count=2.8 HEAD~1 >actual && > ++test_expect_success 'format-patch --range-diff reroll-count with a non-integer' ' > ++ git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual && > + test_when_finished "rm v2.9-0001-*" && > + test_line_count = 1 actual && > -+ test_i18ngrep "^Range-diff ..* v2.8:$" v2.9-0001-* && > ++ test_i18ngrep "^Range-diff:$" v2.9-0001-* && > + grep "> 1: .* new message" v2.9-0001-* > +' > + > -+test_expect_success 'format-patch --range-diff reroll-count with a integer previous-count' ' > -+ git format-patch --range-diff=HEAD~1 -v2 --previous-count=1.8 HEAD~1 >actual && > ++test_expect_success 'format-patch --range-diff reroll-count with a integer' ' > ++ git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual && > + test_when_finished "rm v2-0001-*" && > + test_line_count = 1 actual && > + test_i18ngrep "^Range-diff ..* v1:$" v2-0001-* && > @@ t/t4014-format-patch.sh: test_expect_success 'interdiff: reroll-count' ' > + test_i18ngrep "^Interdiff:$" v2.2-0000-cover-letter.patch > +' > + > -+test_expect_success 'interdiff: reroll-count with a non-integer and previous-count ' ' > -+ git format-patch --cover-letter --interdiff=boop~2 -v2.2 --previous-count=2.1 -1 boop && > -+ test_i18ngrep "^Interdiff ..* v2.1:$" v2.2-0000-cover-letter.patch > -+' > -+ > -+test_expect_success 'interdiff: reroll-count with a integer and previous-count ' ' > -+ git format-patch --cover-letter --interdiff=boop~2 -v2 --previous-count=1.5 -1 boop && > ++test_expect_success 'interdiff: reroll-count with a integer' ' > ++ git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop && > + test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch > +' > -+test_expect_success 'interdiff: previous-count without reroll-count ' ' > -+ test_must_fail git format-patch --cover-letter --interdiff=boop~2 --previous-count=1.5 -1 boop > -+' > ++ > test_expect_success 'interdiff: solo-patch' ' > cat >expect <<-\EOF && > +fleep > > > Documentation/git-format-patch.txt | 1 + > builtin/log.c | 46 +++++++++++++++++++----------- > log-tree.c | 4 +-- > revision.h | 2 +- > t/t3206-range-diff.sh | 16 +++++++++++ > t/t4014-format-patch.sh | 26 +++++++++++++++++ > 6 files changed, 75 insertions(+), 20 deletions(-) > > diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt > index 3e49bf221087..8af0d2923118 100644 > --- a/Documentation/git-format-patch.txt > +++ b/Documentation/git-format-patch.txt > @@ -221,6 +221,7 @@ populated with placeholder text. > `--subject-prefix` option) has ` v` appended to it. E.g. > `--reroll-count=4` may produce `v4-0001-add-makefile.patch` > file that has "Subject: [PATCH v4 1/20] Add makefile" in it. > + now can support non-integrated version number like `-v1.1`. Perhaps something like: + `` can be any string, such as `-v1.1`. In the case where it is a non-integral value, the "Range-diff" and "Interdiff" headers will not include the previous version. > --to=:: > Add a `To:` header to the email headers. This is in addition > diff --git a/builtin/log.c b/builtin/log.c > index f67b67d80ed1..d135c30620b6 100644 > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -1662,13 +1662,15 @@ static void print_bases(struct base_tree_info *bases, FILE *file) > oidclr(&bases->base_commit); > } > > -static const char *diff_title(struct strbuf *sb, int reroll_count, > - const char *generic, const char *rerolled) > +static const char *diff_title(struct strbuf *sb, > + const char *reroll_count_string, > + const char*previous_count_string, > + const char *generic, const char *rerolled) > { > - if (reroll_count <= 0) > + if (!reroll_count_string || !previous_count_string) > strbuf_addstr(sb, generic); > - else /* RFC may be v0, so allow -v1 to diff against v0 */ > - strbuf_addf(sb, rerolled, reroll_count - 1); > + else if (previous_count_string) > + strbuf_addf(sb, rerolled, previous_count_string); > return sb->buf; > } I don't think it's necessary to do this at all. We can just leave `reroll_count < 0` here. > @@ -1718,6 +1720,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) > int use_patch_format = 0; > int quiet = 0; > int reroll_count = -1; > + const char *reroll_count_string = NULL; > + const char *previous_count_string = NULL; > char *cover_from_description_arg = NULL; > char *branch_name = NULL; > char *base_commit = NULL; > @@ -1751,8 +1755,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) > N_("use instead of '.patch'")), > OPT_INTEGER(0, "start-number", &start_number, > N_("start numbering patches at instead of 1")), > - OPT_INTEGER('v', "reroll-count", &reroll_count, > - N_("mark the series as Nth re-roll")), > + OPT_STRING('v', "reroll-count", &reroll_count_string, N_("reroll-count"), > + N_("mark the series as specified version re-roll")), Others may disagree but I'm okay with leaving this as "Nth re-roll". It's just a synopsis. More information can be found in the docs. > OPT_INTEGER(0, "filename-max-length", &fmt_patch_name_max, > N_("max length of output filename")), > OPT_CALLBACK_F(0, "rfc", &rev, NULL, > @@ -1862,11 +1866,17 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) > if (cover_from_description_arg) > cover_from_description_mode = parse_cover_from_description(cover_from_description_arg); > > - if (0 < reroll_count) { > + if (reroll_count_string) { > struct strbuf sprefix = STRBUF_INIT; > - strbuf_addf(&sprefix, "%s v%d", > - rev.subject_prefix, reroll_count); > - rev.reroll_count = reroll_count; > + char *endp; > + > + reroll_count = strtoul(reroll_count_string, &endp, 10); > + if (!*endp && 0 < reroll_count) { This 0 < reroll_count check is unnecessary; it was initialised to -1 and it hasn't changed since here. Also, we can take advantage of the strtol_i() function, which can perform bounds checking and error checking for us. This allows us to assign reroll_count only when a valid integer is found so we can eliminate previous_count_string(). Something like: strtol_i(reroll_count_string, 10, &reroll_count); > + previous_count_string = xstrfmt("%d", reroll_count - 1); > + } > + strbuf_addf(&sprefix, "%s v%s", > + rev.subject_prefix, reroll_count_string); > + rev.reroll_count = reroll_count_string; > rev.subject_prefix = strbuf_detach(&sprefix, NULL); > } > > @@ -2078,9 +2088,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) > die(_("--interdiff requires --cover-letter or single patch")); > rev.idiff_oid1 = &idiff_prev.oid[idiff_prev.nr - 1]; > rev.idiff_oid2 = get_commit_tree_oid(list[0]); > - rev.idiff_title = diff_title(&idiff_title, reroll_count, > - _("Interdiff:"), > - _("Interdiff against v%d:")); > + rev.idiff_title = diff_title(&idiff_title, reroll_count_string, > + previous_count_string, > + _("Interdiff:"), > + _("Interdiff against v%s:")); > } > > if (creation_factor < 0) > @@ -2097,9 +2108,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) > rev.rdiff1 = rdiff1.buf; > rev.rdiff2 = rdiff2.buf; > rev.creation_factor = creation_factor; > - rev.rdiff_title = diff_title(&rdiff_title, reroll_count, > - _("Range-diff:"), > - _("Range-diff against v%d:")); > + rev.rdiff_title = diff_title(&rdiff_title, reroll_count_string, > + previous_count_string, > + _("Range-diff:"), > + _("Range-diff against v%s:")); > } > > if (!signature) { > diff --git a/log-tree.c b/log-tree.c > index 4531cebfab38..5f2e08ebcaab 100644 > --- a/log-tree.c > +++ b/log-tree.c > @@ -369,8 +369,8 @@ void fmt_output_subject(struct strbuf *filename, > int start_len = filename->len; > int max_len = start_len + info->patch_name_max - (strlen(suffix) + 1); > > - if (0 < info->reroll_count) > - strbuf_addf(filename, "v%d-", info->reroll_count); > + if (info->reroll_count) > + strbuf_addf(filename, "v%s-", info->reroll_count); > strbuf_addf(filename, "%04d-%s", nr, subject); > > if (max_len < filename->len) > diff --git a/revision.h b/revision.h > index e6be3c845e66..097d08354c61 100644 > --- a/revision.h > +++ b/revision.h > @@ -235,7 +235,7 @@ struct rev_info { > const char *mime_boundary; > const char *patch_suffix; > int numbered_files; > - int reroll_count; > + const char *reroll_count; > char *message_id; > struct ident_split from_ident; > struct string_list *ref_message_ids; > diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh > index 1b26c4c2ef91..dc419c087e07 100755 > --- a/t/t3206-range-diff.sh > +++ b/t/t3206-range-diff.sh > @@ -521,6 +521,22 @@ test_expect_success 'format-patch --range-diff as commentary' ' > grep "> 1: .* new message" 0001-* > ' > > +test_expect_success 'format-patch --range-diff reroll-count with a non-integer' ' > + git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual && > + test_when_finished "rm v2.9-0001-*" && > + test_line_count = 1 actual && > + test_i18ngrep "^Range-diff:$" v2.9-0001-* && > + grep "> 1: .* new message" v2.9-0001-* > +' > + > +test_expect_success 'format-patch --range-diff reroll-count with a integer' ' > + git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual && > + test_when_finished "rm v2-0001-*" && > + test_line_count = 1 actual && > + test_i18ngrep "^Range-diff ..* v1:$" v2-0001-* && > + grep "> 1: .* new message" v2-0001-* > +' > + > test_expect_success 'range-diff overrides diff.noprefix internally' ' > git -c diff.noprefix=true range-diff HEAD^... > ' > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh > index 66630c8413d5..59dff38065ab 100755 > --- a/t/t4014-format-patch.sh > +++ b/t/t4014-format-patch.sh > @@ -378,6 +378,14 @@ test_expect_success 'reroll count' ' > ! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects > ' > > +test_expect_success 'reroll count with a non-integer' ' > + rm -fr patches && > + git format-patch -o patches --cover-letter --reroll-count 4.4 main..side >list && > + ! grep -v "^patches/v4.4-000[0-3]-" list && > + sed -n -e "/^Subject: /p" $(cat list) >subjects && > + ! grep -v "^Subject: \[PATCH v4.4 [0-3]/3\] " subjects > +' > + > test_expect_success 'reroll count (-v)' ' > rm -fr patches && > git format-patch -o patches --cover-letter -v4 main..side >list && > @@ -386,6 +394,14 @@ test_expect_success 'reroll count (-v)' ' > ! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects > ' > > +test_expect_success 'reroll count (-v) with a non-integer' ' > + rm -fr patches && > + git format-patch -o patches --cover-letter -v4.4 main..side >list && > + ! grep -v "^patches/v4.4-000[0-3]-" list && > + sed -n -e "/^Subject: /p" $(cat list) >subjects && > + ! grep -v "^Subject: \[PATCH v4.4 [0-3]/3\] " subjects > +' > + > check_threading () { > expect="$1" && > shift && > @@ -2255,6 +2271,16 @@ test_expect_success 'interdiff: reroll-count' ' > test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch > ' > > +test_expect_success 'interdiff: reroll-count with a non-integer' ' > + git format-patch --cover-letter --interdiff=boop~2 -v2.2 -1 boop && > + test_i18ngrep "^Interdiff:$" v2.2-0000-cover-letter.patch > +' > + > +test_expect_success 'interdiff: reroll-count with a integer' ' > + git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop && > + test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch > +' > + > test_expect_success 'interdiff: solo-patch' ' > cat >expect <<-\EOF && > +fleep > > base-commit: 966e671106b2fd38301e7c344c754fd118d0bb07 > -- > gitgitgadget