Re: [PATCH V4] git-apply: add --allow-empty flag

From: Jerry Zhang <jerry@skydio.com>
Date: Dec 13, 2021, 21:52 UTC
Message-ID: <CAMKO5Ctq8kzAvHAXxPVd06_Ko7-GW4CQbUmw7g7Eb7Su_Cp8RQ@mail.gmail.com>
In-Reply-To: <xmqqlf0ob2o0.fsf@gitster.g>

On Mon, Dec 13, 2021 at 1:44 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 29 quoted lines

>
> Jerry Zhang <jerry@skydio.com> writes:
>
> > diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
> > index a32ad64718..b6d77f4206 100644
> > --- a/Documentation/git-apply.txt
> > +++ b/Documentation/git-apply.txt
> > @@ -14,11 +14,11 @@ SYNOPSIS
> >         [--allow-binary-replacement | --binary] [--reject] [-z]
> >         [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
> >         [--ignore-space-change | --ignore-whitespace]
> >         [--whitespace=(nowarn|warn|fix|error|error-all)]
> >         [--exclude=<path>] [--include=<path>] [--directory=<root>]
> > -       [--verbose | --quiet] [--unsafe-paths] [<patch>...]
> > +       [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
> >
> >  DESCRIPTION
> >  -----------
> >  Reads the supplied diff output (i.e. "a patch") and applies it to files.
> >  When running from a subdirectory in a repository, patched paths
>
> Applying: git-apply: add --allow-empty flag
> error: patch failed: Documentation/git-apply.txt:14
> error: Documentation/git-apply.txt: patch does not apply
> Patch failed at 0001 git-apply: add --allow-empty flag
>
> Hmph....  Where did that "| --quiet" thing come from?
>
>

Apologies, I overlooked a dependence on my other patch here: https://patchwork.kernel.org/project/git/patch/20210427194106.14500-1-jerry@skydio.com/

Let me know if you'd like a clean patch off of master. Please give the other patch a look though, as I've addressed outstanding comments.