From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Matt Draisey <matt@draisey.ca>, git@vger.kernel.org
Subject: Re: Detached checkout will clobber branch head when using symlink HEAD
Date: Sun, 19 Oct 2008 12:36:08 -0700 [thread overview]
Message-ID: <7vskqs74yf.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20081019130050.GA1822@coredump.intra.peff.net> (Jeff King's message of "Sun, 19 Oct 2008 09:00:50 -0400")
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.
prev parent reply other threads:[~2008-10-19 19:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-15 18:24 Detached checkout will clobber branch head when using symlink HEAD Matt Draisey
2008-10-16 19:17 ` Jeff King
2008-10-16 20:11 ` Matt Draisey
2008-10-16 20:20 ` Nicolas Pitre
2008-10-16 20:22 ` Jeff King
2008-10-16 20:30 ` Nicolas Pitre
2008-10-16 20:28 ` Matt Draisey
2008-10-16 20:47 ` Nicolas Pitre
2008-10-16 20:39 ` Jeff King
2008-10-17 23:08 ` Junio C Hamano
2008-10-17 23:10 ` [PATCH 1/3] demonstrate breakage of detached checkout with symbolic link HEAD Junio C Hamano
2008-10-17 23:10 ` [PATCH 2/3] Enhance hold_lock_file_for_{update,append}() API Junio C Hamano
2008-10-17 23:11 ` [PATCH 3/3] Fix checkout not to clobber the branch when using symlinked HEAD upon detaching Junio C Hamano
2008-10-19 13:00 ` Detached checkout will clobber branch head when using symlink HEAD Jeff King
2008-10-19 19:36 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vskqs74yf.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matt@draisey.ca \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).