From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Oct 2008 19:36:08 GMT
Subject: Re: Detached checkout will clobber branch head when using symlink HEAD
Message-ID: <7vskqs74yf.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20081019130050.GA1822@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> But if I am reading your patch right, you are actually enabling detached
> HEAD in this instance, which is much better. Unfortunately, I had quite
> a few conflicts in applying your patches on top of master (with or
> without the patch from "checkout --track -b broken"), and when I thought
> I had fixed up the result, the test actually still failed.
>
> So I will take your word that it actually works, and that I screwed up
> resolving the conflicts.

It's the three-patch series that leads to 684968c (Fix checkout not to
clobber the branch when using symlinked HEAD upon detaching, 2008-10-17).

> PS If you are rebasing or resolving anyway, as I suspect you will have
> to, there is a typo in the test: s/detch/detach/

Thanks; the series was only in 'pu', so I will.