Christian Couder <christian.couder@xxxxxxxxx> writes:
> Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
> ---
> 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;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html