From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Jun 2013 18:43:37 GMT
Subject: Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree
Message-ID: <7v8v24vd0m.fsf@alter.siamese.dyndns.org>
In-Reply-To: <aca810600b895ed3f0a3fc575e0f6861e591de5b.1371733403.git.trast@inf.ethz.ch>

Thomas Rast <trast@inf.ethz.ch> writes:

> The logic for pulling into an unborn branch was originally designed to
> be used on a newly-initialized repository (d09e79c, git-pull: allow
> pulling into an empty repository, 2006-11-16).  It thus did not
> initially deal with uncommitted changes in the unborn branch.  The
> case of an _unstaged_ untracked file was fixed by 4b3ffe5 (pull: do
> not clobber untracked files on initial pull, 2011-03-25).  However, it
> still clobbered existing staged files, both when the file exists in
> the merged commit (it will be overwritten), and when it does not (it
> will be deleted).

Perhaps making sure the index is empty is sufficient, then?