From: Eli Schwartz <eschwartz@archlinux.org>
To: git@vger.kernel.org
Subject: [PATCH v3 0/3] Add some more options to the pretty-formats
Date: Fri, 29 Oct 2021 14:45:09 -0400 [thread overview]
Message-ID: <20211029184512.1568017-1-eschwartz@archlinux.org> (raw)
In-Reply-To: <20211026013452.1372122-1-eschwartz@archlinux.org>
This revision only contains style nits in response to review comments.
See below.
Eli Schwartz (3):
pretty.c: rework describe options parsing for better extensibility
pretty: add tag option to %(describe)
pretty: add abbrev option to %(describe)
Documentation/pretty-formats.txt | 16 +++++++---
pretty.c | 54 ++++++++++++++++++++++++++------
t/t4205-log-pretty-formats.sh | 16 ++++++++++
3 files changed, 71 insertions(+), 15 deletions(-)
Range-diff against v2:
1: 1cf0d82b91 ! 1: 55a20468d3 pretty.c: rework describe options parsing for better extensibility
@@ pretty.c: int format_set_trailers_options(struct process_trailer_options *opts,
- &argval, &arglen)) {
- matched = options[i];
+ for (i = 0; !found && i < ARRAY_SIZE(option); i++) {
-+ switch(option[i].type) {
++ switch (option[i].type) {
+ case OPT_STRING:
+ if (match_placeholder_arg_value(arg, option[i].name, &arg,
-+ &argval, &arglen) && arglen) {
++ &argval, &arglen)) {
+ if (!arglen)
+ return 0;
+ strvec_pushf(args, "--%s=%.*s", option[i].name, (int)arglen, argval);
2: cb6af9bc14 ! 2: c34c8a4f7f pretty: add tag option to %(describe)
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *ar
int i;
for (i = 0; !found && i < ARRAY_SIZE(option); i++) {
- switch(option[i].type) {
+ switch (option[i].type) {
+ case OPT_BOOL:
-+ if(match_placeholder_bool_arg(arg, option[i].name, &arg, &optval)) {
-+ if (optval) {
++ if (match_placeholder_bool_arg(arg, option[i].name, &arg, &optval)) {
++ if (optval)
+ strvec_pushf(args, "--%s", option[i].name);
-+ } else {
++ else
+ strvec_pushf(args, "--no-%s", option[i].name);
-+ }
+ found = 1;
+ }
+ break;
case OPT_STRING:
if (match_placeholder_arg_value(arg, option[i].name, &arg,
- &argval, &arglen) && arglen) {
+ &argval, &arglen)) {
## t/t4205-log-pretty-formats.sh ##
@@ t/t4205-log-pretty-formats.sh: test_expect_success '%(describe:exclude=...) vs git describe --exclude ...' '
3: 08ade18b35 ! 3: b751aaf3c6 pretty: add abbrev option to %(describe)
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *ar
break;
+ case OPT_INTEGER:
+ if (match_placeholder_arg_value(arg, option[i].name, &arg,
-+ &argval, &arglen) && arglen) {
++ &argval, &arglen)) {
++ char *endptr;
+ if (!arglen)
+ return 0;
-+ char* endptr;
+ strtol(argval, &endptr, 10);
+ if (endptr - argval != arglen)
+ return 0;
@@ pretty.c: static size_t parse_describe_args(const char *start, struct strvec *ar
+ break;
case OPT_STRING:
if (match_placeholder_arg_value(arg, option[i].name, &arg,
- &argval, &arglen) && arglen) {
+ &argval, &arglen)) {
## t/t4205-log-pretty-formats.sh ##
@@ t/t4205-log-pretty-formats.sh: test_expect_success '%(describe:tags) vs git describe --tags' '
--
2.33.1
next prev parent reply other threads:[~2021-10-29 18:45 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-24 1:42 [PATCH 0/3] Add some more options to the pretty-formats Eli Schwartz
2021-10-24 1:42 ` [PATCH 1/3] pretty.c: rename describe options variable to more descriptive name Eli Schwartz
2021-10-24 4:31 ` Junio C Hamano
2021-10-24 15:37 ` Eli Schwartz
2021-10-24 1:42 ` [PATCH 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-24 4:57 ` Junio C Hamano
2021-10-24 15:38 ` Eli Schwartz
2021-10-24 1:42 ` [PATCH 3/3] pretty: add abbrev " Eli Schwartz
2021-10-24 5:15 ` Junio C Hamano
2021-10-24 15:43 ` Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 0/3] Add some more options to the pretty-formats Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 1/3] pretty.c: rework describe options parsing for better extensibility Eli Schwartz
2021-10-26 5:18 ` Eric Sunshine
2021-10-26 20:05 ` Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-26 5:25 ` Eric Sunshine
2021-10-26 20:06 ` Eli Schwartz
2021-10-26 1:34 ` [PATCH v2 3/3] pretty: add abbrev " Eli Schwartz
2021-10-26 5:36 ` Eric Sunshine
2021-10-26 12:06 ` Đoàn Trần Công Danh
2021-10-26 17:28 ` Eric Sunshine
2021-10-26 19:12 ` Eli Schwartz
2021-10-27 8:05 ` Carlo Arenas
2021-11-03 23:20 ` Johannes Schindelin
2021-11-04 9:29 ` Johannes Schindelin
2021-11-07 12:39 ` Eli Schwartz
2021-10-29 18:45 ` Eli Schwartz [this message]
2021-10-29 18:45 ` [PATCH v3 1/3] pretty.c: rework describe options parsing for better extensibility Eli Schwartz
2021-10-29 20:11 ` Junio C Hamano
2021-10-29 21:06 ` Eli Schwartz
2021-10-29 21:34 ` Junio C Hamano
2021-10-29 18:45 ` [PATCH v3 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-29 20:18 ` Junio C Hamano
2021-10-29 21:14 ` Eli Schwartz
2021-10-29 21:46 ` Junio C Hamano
2021-10-29 21:28 ` Junio C Hamano
2021-10-29 21:44 ` Eli Schwartz
2021-10-29 18:45 ` [PATCH v3 3/3] pretty: add abbrev " Eli Schwartz
2021-10-29 18:51 ` Eric Sunshine
2021-10-29 19:04 ` Eli Schwartz
2021-10-31 17:15 ` [PATCH v4 0/3] Add some more options to the pretty-formats Eli Schwartz
2021-10-31 17:15 ` [PATCH v4 1/3] pretty.c: rework describe options parsing for better extensibility Eli Schwartz
2021-10-31 17:15 ` [PATCH v4 2/3] pretty: add tag option to %(describe) Eli Schwartz
2021-10-31 18:07 ` Junio C Hamano
2021-10-31 18:58 ` Eli Schwartz
2021-10-31 17:15 ` [PATCH v4 3/3] pretty: add abbrev " Eli Schwartz
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211029184512.1568017-1-eschwartz@archlinux.org \
--to=eschwartz@archlinux.org \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).