public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Max Kirillov <max@max630•net>,
	Bert Wesarg <bert.wesarg@googlemail•com>,
	git@vger•kernel.org
Subject: Re: [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change
Date: Tue, 01 Jul 2014 10:01:45 -0700	[thread overview]
Message-ID: <xmqqa98txbba.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.1.00.1406301650430.14982@s15462909.onlinehome-server.info> (Johannes Schindelin's message of "Mon, 30 Jun 2014 16:55:10 +0200 (CEST)")

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.

next prev parent reply	other threads:[~2014-07-01 17:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-28 22:04 [PATCH v2 0/2] git-merge-file: do not add LF at EOF while applying unrelated change Max Kirillov
2014-06-28 22:04 ` [PATCH v2 1/2] t6023-merge-file.sh: fix and mark as broken invalid tests Max Kirillov
2014-06-28 22:04 ` [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change Max Kirillov
2014-06-30 14:55   ` Johannes Schindelin
2014-07-01 17:01     ` Junio C Hamano [this message]
2014-07-02  4:44     ` Max Kirillov
2014-07-02 14:08       ` Johannes Schindelin
2014-07-03  4:31         ` Max Kirillov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqa98txbba.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=Johannes.Schindelin@gmx$(echo .)de \
    --cc=bert.wesarg@googlemail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=max@max630$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox