From: Jerry Zhang <jerry@skydio.com>
To: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH V2] git-apply: add --quiet flag
Date: Fri, 10 Dec 2021 18:07:55 -0800 [thread overview]
Message-ID: <CAMKO5CvR2m6nvGXfqap=9w07Mw1p2Sgvw39dfhdJVU28K+ZCbg@mail.gmail.com> (raw)
In-Reply-To: <20210728032230.24611-1-jerry@skydio.com>
On Tue, Jul 27, 2021 at 8:22 PM Jerry Zhang <jerry@skydio.com> wrote:
>
> Replace OPT_VERBOSE with OPT_VERBOSITY.
>
> This adds a --quiet flag to "git apply" so
> the user can turn down the verbosity.
>
> Signed-off-by: Jerry Zhang <jerry@skydio.com>
> ---
> V1->V2: rebase on master and rerun tests
>
> Documentation/git-apply.txt | 7 ++++++-
> apply.c | 2 +-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
> index aa1ae56a25..a32ad64718 100644
> --- a/Documentation/git-apply.txt
> +++ b/Documentation/git-apply.txt
> @@ -16,7 +16,7 @@ SYNOPSIS
> [--ignore-space-change | --ignore-whitespace]
> [--whitespace=(nowarn|warn|fix|error|error-all)]
> [--exclude=<path>] [--include=<path>] [--directory=<root>]
> - [--verbose] [--unsafe-paths] [<patch>...]
> + [--verbose | --quiet] [--unsafe-paths] [<patch>...]
>
> DESCRIPTION
> -----------
> @@ -228,6 +228,11 @@ behavior:
> current patch being applied will be printed. This option will cause
> additional information to be reported.
>
> +-q::
> +--quiet::
> + Suppress stderr output. Messages about patch status and progress
> + will not be printed.
> +
> --recount::
> Do not trust the line counts in the hunk headers, but infer them
> by inspecting the patch (e.g. after editing the patch without
> diff --git a/apply.c b/apply.c
> index fb321c707b..d530c3eb47 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -5051,7 +5051,7 @@ int apply_parse_options(int argc, const char **argv,
> N_("leave the rejected hunks in corresponding *.rej files")),
> OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
> N_("allow overlapping hunks")),
> - OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
> + OPT__VERBOSITY(&state->apply_verbosity),
> OPT_BIT(0, "inaccurate-eof", options,
> N_("tolerate incorrectly detected missing new-line at the end of file"),
> APPLY_OPT_INACCURATE_EOF),
> --
> 2.32.0.1314.g6ed4fcc4cc
>
Any updates on this patch?
prev parent reply other threads:[~2021-12-11 2:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 19:41 [PATCH] git-apply: add --quiet flag Jerry Zhang
2021-04-28 7:40 ` Junio C Hamano
2021-04-28 9:16 ` Junio C Hamano
2021-04-28 18:18 ` Jerry Zhang
2021-07-28 3:22 ` [PATCH V2] " Jerry Zhang
2021-12-11 2:07 ` Jerry Zhang [this message]
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='CAMKO5CvR2m6nvGXfqap=9w07Mw1p2Sgvw39dfhdJVU28K+ZCbg@mail.gmail.com' \
--to=jerry@skydio.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).