From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: "git checkout" branch switching safety broken in 'next'
Date: Mon, 10 Mar 2008 07:38:25 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.1.00.0803100735530.5896@woody.linux-foundation.org> (raw)
In-Reply-To: <7vmyp7j8ui.fsf@gitster.siamese.dyndns.org>
On Mon, 10 Mar 2008, Junio C Hamano wrote:
>
> Linus, please be careful when switching branches if you are using your
> unpack_trees() patch (in 'next') for production. There is a breakage that
> makes switching branches with "git checkout" lose your work-in-progress.
Ouch. I've been using those patches "in production" since posting them,
but since I don't generally use branches on the kernel (it happens, but
it's rare), I wouldn't have noticed.
And in git, it probably wouldn't have triggered for me, since it looks
like it would only trigger for changes in subdirectories, not in the top
level (which is probably also why it passed all the tests!).
My bad. Your patch looks obviously correct.
Linus
next prev parent reply other threads:[~2008-03-10 14:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-10 8:12 "git checkout" branch switching safety broken in 'next' Junio C Hamano
2008-03-10 9:29 ` Jakub Narebski
2008-03-10 13:56 ` Jay Soffian
2008-03-11 8:57 ` setting git-gui locale Maxim Fridental
2008-03-11 10:01 ` Johannes Schindelin
2008-03-10 14:38 ` Linus Torvalds [this message]
2008-03-11 2:41 ` "git diff-index" broken in 'next' Junio C Hamano
2008-03-11 3:20 ` Linus Torvalds
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=alpine.LFD.1.00.0803100735530.5896@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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