From: Christian Couder <christian.couder@gmail.com>
Date: Wed, 11 May 2016 13:16:18 +0000 (+0200)
Subject: builtin/apply: move 'read_stdin' global into cmd_apply()
X-Git-Tag: v2.10.0-rc0~190^2~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dcde8b3dcd8d4411a2311fa0a93ca4ca3b26d61f?hp=d1b27ced9a38ed03e99422b6cb24ff95c7437663

builtin/apply: move 'read_stdin' global into cmd_apply()

The 'read_stdin' variable doesn't need to be static and global to the
file. It can be local to cmd_apply(), so let's move it there.

This will make it easier to libify the apply functionality.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/apply.c b/builtin/apply.c
index 5a1d65a695..c911e4ec82 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -78,7 +78,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)
 {
@@ -4517,6 +4516,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;
 
 	const char *whitespace_option = NULL;