Subject: Re: [PATCH v2 03/94] builtin/apply: avoid parameter shadowing 'linenr' global

From: Junio C Hamano <[email-masked]>
Date: Thu, 12 May 2016 12:11:03 -0700

Christian Couder <[email-masked]> writes:

> Let's just rename the global 'state_linenr' as it will become
> 'state->linenr' in a following patch.
>
> This also avoid errors when compiling with -Wshadow and makes
> it safer to later move global variables into a "state" struct.

Looks correctly done (I looked at remaining instances of "linenr").

Will queue.  Thanks.