From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Dec 2021 21:44:31 GMT
Subject: Re: [PATCH V4] git-apply: add --allow-empty flag
Message-ID: <xmqqlf0ob2o0.fsf@gitster.g>
In-Reply-To: <20211213202826.7051-1-jerry@skydio.com>

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?