Re: [PATCH v1] merge - rename a shadowed variable in cmd_merge

2019-07-08 Thread Junio C Hamano
Edmundo Carmona Antoranz writes: > variable ret used in cmd_merge introduced in d5a35c114ab was already > a local variable used inside a for loop inside the function. Strictly speaking, there was a local variable 'ret' inside for loop, which is unrelated to the variable introduced by the said co

[PATCH v1] merge - rename a shadowed variable in cmd_merge

2019-07-05 Thread Edmundo Carmona Antoranz
variable ret used in cmd_merge introduced in d5a35c114ab was already a local variable used inside a for loop inside the function. for-local variable is being renamed to ret_try_merge to avoid shadow. --- builtin/merge.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff