From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Apr 2016 20:28:39 GMT
Subject: Re: [PATCH 27/83] builtin/apply: move 'read_stdin' global into cmd_apply()
Message-ID: <xmqqy480dsi0.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1461504863-15946-28-git-send-email-chriscool@tuxfamily.org>

Christian Couder <christian.couder@gmail.com> writes:

> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  builtin/apply.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Makes sense but do so immediately next to 06/83, "options" thing?

> diff --git a/builtin/apply.c b/builtin/apply.c
> index 699cabf..be237d1 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -96,7 +96,6 @@ static enum ws_ignore {
>  
>  static const char *patch_input_file;
>  static struct strbuf root = STRBUF_INIT;
> -static int read_stdin = 1;
>  
>  static void parse_whitespace_option(const char *option)
>  {
> @@ -4586,6 +4585,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
>  	int is_not_gitdir = !startup_info->have_repository;
>  	int force_apply = 0;
>  	int options = 0;
> +	int read_stdin = 1;
>  	struct apply_state state;
>  
>  	const char *whitespace_option = NULL;