From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Paolo Bonzini <bonzini@gnu.org>, Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [PATCH] Fix in-index merge.
Date: Sat, 23 Aug 2008 01:50:52 -0700 [thread overview]
Message-ID: <7vd4k02jyr.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1219479293-29111-1-git-send-email-vmiklos@frugalware.org> (Miklos Vajna's message of "Sat, 23 Aug 2008 10:14:53 +0200")
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.
next prev parent reply other threads:[~2008-08-23 8:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-22 6:36 [bug] git `next' does not do trivial merges Paolo Bonzini
2008-08-22 19:31 ` Jeff King
2008-08-23 6:08 ` Miklos Vajna
2008-08-23 8:14 ` [PATCH] Fix in-index merge Miklos Vajna
2008-08-23 8:17 ` [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Miklos Vajna
2008-08-23 9:01 ` Junio C Hamano
2008-08-23 10:57 ` Miklos Vajna
2008-08-23 19:55 ` Junio C Hamano
2008-08-23 19:56 ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
2008-08-24 1:58 ` Junio C Hamano
2008-08-28 13:43 ` [PATCH] builtin-merge: avoid run_command_v_opt() for recursive and subtree Miklos Vajna
2008-08-23 19:57 ` [PATCH 2/2] unpack_trees(): protect the handcrafted in-core index from read_cache() Junio C Hamano
2008-08-23 9:50 ` [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Junio C Hamano
2008-08-23 8:50 ` Junio C Hamano [this message]
2008-08-23 10:41 ` [PATCH] Fix in-index merge Miklos Vajna
2008-08-23 9:19 ` Paolo Bonzini
2008-08-23 9:55 ` Junio C Hamano
2008-08-23 10:00 ` Junio C Hamano
2008-08-23 10:41 ` [RFH] two and half potential fixlets to the in-core index handling Junio C Hamano
2008-08-23 18:13 ` Linus Torvalds
2008-08-23 19:14 ` Junio C Hamano
2008-08-23 19:21 ` Junio C Hamano
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=7vd4k02jyr.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=vmiklos@frugalware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.