From: Jeff King <peff@peff.net>
Date: Sat, 10 Aug 2013 07:33:43 GMT
Subject: Re: Bug: Pulling remotes into an empty repo deletes the index
Message-ID: <20130810073343.GE30185@sigill.intra.peff.net>
In-Reply-To: <20130803165728.GB2893@elie.Belkin>

On Sat, Aug 03, 2013 at 09:57:28AM -0700, Jonathan Nieder wrote:

> > All is not lost.  Your local files should be stored in the repository's
> > reflog.  Examine the output of "git reflog".  You can then reset your
> > working directory to obtain those files by doing something _like_
> > "git reset --hard HEAD@{1}".
> 
> Adam hadn't made a commit, so that wouldn't work in this case.
> 
> "git fsck --lost-found" should be helpful, but yeah, this is a bug.
> See for example [1] for the start of a patch to play with (needs
> tests).

If I understand the situation correctly, this is actually already fixed
in v1.8.3.3 and higher by b4dc085 (pull: merge into unborn by
fast-forwarding from empty tree, 2013-06-20).

-Peff