From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 May 2016 19:31:43 GMT
Subject: Re: [PATCH v2 16/94] builtin/apply: move 'update_index' global into 'struct apply_state'
Message-ID: <xmqqwpmzdqe8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160511131745.2914-17-chriscool@tuxfamily.org>

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

> To libify the apply functionality the 'update_index' variable should
> not be static and global to the file. Let's move it into
> 'struct apply_state'.
>
> Reviewed-by: Stefan Beller <sbeller@google.com>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  builtin/apply.c | 45 ++++++++++++++++++++++++++-------------------
>  1 file changed, 26 insertions(+), 19 deletions(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index 97af6ea..635a9ff 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -39,6 +39,7 @@ struct apply_state {
>  	int check_index;
>  
>  	int unidiff_zero;
> +	int update_index;

This should sit right next to check_index, I would think.

Otherwise looks correct.