From: Miklos Vajna <vmiklos@frugalware.org>
Date: Wed, 20 Aug 2008 22:35:11 GMT
Subject: Re: "git-merge": allow fast-forwarding in a stat-dirty tree
Message-ID: <20080820223511.GM23800@genesis.frugalware.org>
In-Reply-To: <7vljyrnxt3.fsf_-_@gitster.siamese.dyndns.org>

On Wed, Aug 20, 2008 at 03:09:28PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
>  	if (read_cache_unmerged())
>  		die("you need to resolve your current index first");
> +	refresh_cache(REFRESH_QUIET);

I did not realise that we need a refresh_cache() after
read_cache_unmerged() here, and thus the other refresh_cache() call is
unnecessary.

Thanks.