From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Aug 2008 09:01:43 GMT
Subject: Re: [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge
Message-ID: <7v3akw2jgo.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1219479422-29148-1-git-send-email-vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> Using unmerged_cache() without reading the cache first never will return
> anything. However, if we read the cache early then we have to discard it
> when we want to read it again from the disk.

With this, I do not think you would need to keep the read_cache() you
added to the beginning of the read_tree_trivial(), for the same reason you
are removing read_cache_unmerged() from the beginning of
checkout_fast_forward() in this patch.