From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Apr 2016 20:27:35 GMT
Subject: Re: [PATCH 22/83] builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
Message-ID: <xmqq37q8f748.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1461504863-15946-23-git-send-email-chriscool@tuxfamily.org>

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

> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  builtin/apply.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index 506357c..c45e481 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -57,6 +57,8 @@ struct apply_state {
>  	int unidiff_zero;
>  
>  	int update_index;
> +
> +	int unsafe_paths;
>  };

Having said 

    I like the way this series moves only a few variables at a time to
    limit the scope of each step.

it gets irritating to see all these unnecessary blank lines in the
structure definition added by each step, which would mean all of
these patches need to fix them in the next reroll.