From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Phillip Wood <phillip.wood123@gmail.com>,
Dragan Simic <dsimic@manjaro.org>
Subject: [PATCH v3 0/2] format-patch --rfc=WIP
Date: Sun, 21 Apr 2024 11:59:13 -0700 [thread overview]
Message-ID: <20240421185915.1031590-1-gitster@pobox.com> (raw)
In-Reply-To: <xmqqy1993tc1.fsf@gitster.g>
So here is the hopefully final round. I think the first one is
good, but the second one is of dubious and possibly negative value
(for the reasons, see its proposed log message), so I am undecided.
Junio C Hamano (2):
format-patch: allow --rfc to optionally take a value, like --rfc=WIP
format-patch: "--rfc=-(WIP)" appends to produce [PATCH (WIP)]
Documentation/git-format-patch.txt | 19 ++++++++++++++-----
builtin/log.c | 25 +++++++++++++++++++++----
t/t4014-format-patch.sh | 28 +++++++++++++++++++++++++++-
3 files changed, 62 insertions(+), 10 deletions(-)
Range-diff against v2:
1: bffe0055d0 ! 1: a874b85cb5 format-patch: allow --rfc to optionally take a value, like --rfc=WIP
@@ builtin/log.c: static int subject_prefix_callback(const struct option *opt, cons
+static int rfc_callback(const struct option *opt, const char *arg,
+ int unset)
+{
-+ struct strbuf *rfc;
++ const char **rfc = opt->value;
+
-+ rfc = opt->value;
-+ strbuf_reset(rfc);
++ *rfc = opt->value;
+ if (!unset)
-+ strbuf_addstr(rfc, arg ? arg : "RFC");
++ *rfc = arg ? arg : "RFC";
+ return 0;
+}
+
@@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *pre
struct strbuf rdiff2 = STRBUF_INIT;
struct strbuf rdiff_title = STRBUF_INIT;
struct strbuf sprefix = STRBUF_INIT;
-+ struct strbuf rfc = STRBUF_INIT;
++ const char *rfc = NULL;
int creation_factor = -1;
- int rfc = 0;
@@ builtin/log.c: int cmd_format_patch(int argc, const char **argv, const char *pre
N_("cover-from-description-mode"),
N_("generate parts of a cover letter based on a branch's description")),
@@ 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 (rfc)
+ if (rfc)
- strbuf_insertstr(&sprefix, 0, "RFC ");
-+ if (rfc.len)
-+ strbuf_insertf(&sprefix, 0, "%s ", rfc.buf);
++ strbuf_insertf(&sprefix, 0, "%s ", rfc);
if (reroll_count) {
strbuf_addf(&sprefix, " v%s", reroll_count);
-: ---------- > 2: 6b82e903b6 format-patch: "--rfc=-(WIP)" appends to produce [PATCH (WIP)]
--
2.45.0-rc0
next prev parent reply other threads:[~2024-04-21 18:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 22:54 [PATCH] format-patch: allow --rfc to optionally take a value, like --rfc=WIP Junio C Hamano
2024-04-19 0:29 ` Dragan Simic
2024-04-19 14:09 ` Phillip Wood
2024-04-19 17:03 ` Junio C Hamano
2024-04-21 14:18 ` Dragan Simic
2024-04-19 18:00 ` Jeff King
2024-04-19 18:19 ` Junio C Hamano
2024-04-19 22:01 ` [PATCH v2] " Junio C Hamano
2024-04-21 15:41 ` Phillip Wood
2024-04-21 18:58 ` Junio C Hamano
2024-04-21 18:59 ` Junio C Hamano [this message]
2024-04-21 18:59 ` [PATCH v3 1/2] " Junio C Hamano
2024-04-21 18:59 ` [PATCH v3 2/2] format-patch: "--rfc=-(WIP)" appends to produce [PATCH (WIP)] Junio C Hamano
2024-04-21 19:37 ` Dragan Simic
2024-04-24 10:17 ` Phillip Wood
2024-04-24 15:52 ` Dragan Simic
2024-04-23 17:52 ` [PATCH v4 0/2] format-patch --rfc=WIP Junio C Hamano
2024-04-23 17:52 ` [PATCH v4 1/2] format-patch: allow --rfc to optionally take a value, like --rfc=WIP Junio C Hamano
2024-04-24 10:16 ` Phillip Wood
2024-04-23 17:52 ` [PATCH v4 2/2] format-patch: "--rfc=-(WIP)" appends to produce [PATCH (WIP)] Junio C Hamano
2024-04-24 10:16 ` Phillip Wood
2024-04-24 15:25 ` Junio C Hamano
2024-04-24 16:34 ` Dragan Simic
2024-04-24 15:58 ` Dragan Simic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240421185915.1031590-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=dsimic@manjaro.org \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).