From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Date: Sat, 23 Aug 2008 12:55:03 -0700 Message-ID: <7vk5e7y0a0.fsf@gitster.siamese.dyndns.org> References: <7v3akw2jgo.fsf@gitster.siamese.dyndns.org> <1219489071-5679-1-git-send-email-vmiklos@frugalware.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Paolo Bonzini , Jeff King , git@vger.kernel.org To: Miklos Vajna X-From: git-owner@vger.kernel.org Sat Aug 23 21:56:58 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KWzED-000746-0g for gcvg-git-2@gmane.org; Sat, 23 Aug 2008 21:56:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756716AbYHWTzV (ORCPT ); Sat, 23 Aug 2008 15:55:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757122AbYHWTzU (ORCPT ); Sat, 23 Aug 2008 15:55:20 -0400 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:48867 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755409AbYHWTzS (ORCPT ); Sat, 23 Aug 2008 15:55:18 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTP id 811F565E39; Sat, 23 Aug 2008 15:55:17 -0400 (EDT) Received: from pobox.com (ip68-225-240-211.oc.oc.cox.net [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTPSA id AE1A165E36; Sat, 23 Aug 2008 15:55:05 -0400 (EDT) In-Reply-To: <1219489071-5679-1-git-send-email-vmiklos@frugalware.org> (Miklos Vajna's message of "Sat, 23 Aug 2008 12:57:51 +0200") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: 68C5A610-714D-11DD-82D2-3113EBD4C077-77302942!a-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: We've exchanged quite a few "here is a better one", "oops, that is not enough", which is confusing to bystanders. Here is my proposed final series, meant to be applied to 'maint'. [1/2] merge: fix numerus bugs around "trivial merge" area [2/2] unpack_trees(): protect the handcrafted in-core index from read_cache()