Re: "git-merge": allow fast-forwarding in a stat-dirty tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Aug 20, 2008 at 03:09:28PM -0700, Junio C Hamano <gitster@xxxxxxxxx> 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.

Attachment: pgpTeorWNJmxf.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux