From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 01 Jul 2014 17:01:45 GMT
Subject: Re: [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change
Message-ID: <xmqqa98txbba.fsf@gitster.dls.corp.google.com>
In-Reply-To: <alpine.DEB.1.00.1406301650430.14982@s15462909.onlinehome-server.info>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Max,
>
> On Sun, 29 Jun 2014, Max Kirillov wrote:
>
>> diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
>> index 9e13b25..625198e 100644
>> --- a/xdiff/xmerge.c
>> +++ b/xdiff/xmerge.c
>> @@ -245,11 +245,11 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
>>  					      dest ? dest + size : NULL);
>>  			/* Postimage from side #1 */
>>  			if (m->mode & 1)
>> -				size += xdl_recs_copy(xe1, m->i1, m->chg1, 1,
>> +				size += xdl_recs_copy(xe1, m->i1, m->chg1, (m->mode & 2),
>>  						      dest ? dest + size : NULL);
>>  			/* Postimage from side #2 */
>>  			if (m->mode & 2)
>> -				size += xdl_recs_copy(xe2, m->i2, m->chg2, 1,
>> +				size += xdl_recs_copy(xe2, m->i2, m->chg2, 0,
>>  						      dest ? dest + size : NULL);
>>  		} else
>>  			continue;
>
> Makes sense to me, especially with the nice explanation in the commit
> message.

> Having said that, here is my ACK for the current revision of the patch
> series ...

Thanks, both.  Queued.