From: Linus Torvalds Date: Mon, 10 Mar 2008 14:38:25 GMT Subject: Re: "git checkout" branch switching safety broken in 'next' Message-ID: 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