From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Aug 2008 08:50:52 GMT
Subject: Re: [PATCH] Fix in-index merge.
Message-ID: <7vd4k02jyr.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1219479293-29111-1-git-send-email-vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> There were 3 issues:
>
> 1) We need read_cache() before using unpack_trees().
>
> 2) commit_tree() frees the parents, so we need to malloc them.
>
> 3) The current HEAD was missing from the parent list.
>
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
> ---
>
> On Fri, Aug 22, 2008 at 08:36:39AM +0200, Paolo Bonzini <bonzini@gnu.org> wrote:
>> I had already posted this bug report yesterday but it was hidden in a
>> cover
>> letter at
>> http://permalink.gmane.org/gmane.comp.version-control.git/93143
>
> This should fix the issue.
>
>  builtin-merge.c          |   11 +++++++----
>  t/t7607-merge-inindex.sh |   29 +++++++++++++++++++++++++++++
>  2 files changed, 36 insertions(+), 4 deletions(-)
>  create mode 100755 t/t7607-merge-inindex.sh

Please do not add new testfiles unnecessarily.  You already have test
scripts that cover "git-merge".  Add new ones to them.  The same comment
goes to the other patch.