From: Jeff King <peff@peff.net>
Date: Sat, 05 May 2012 09:01:09 GMT
Subject: Re: [PATCH 2/2] checkout (detached): truncate list of orphaned commits at the new HEAD
Message-ID: <20120505090108.GA8172@sigill.intra.peff.net>
In-Reply-To: <4FA41C98.2010105@kdbg.org>

On Fri, May 04, 2012 at 08:14:48PM +0200, Johannes Sixt wrote:

> When git checkout switches from a detached HEAD to any other commit, then
> all orphaned commits were listed in a warning:
> 
>   Warning: you are leaving 2 commits behind...:
> 
>     a5e5396 another fixup
>     6aa1af6 fixup foo
> 
> But if the new commit is actually one from this list (6aa1af6 in this
> example), then the list in the warning can be truncated at the new HEAD,
> because history beginning at HEAD is not "left behind". This makes it so.

Thanks, this has bugged me a few times in the past, but I've never
gotten around to investigating and fixing it.

>  builtin/checkout.c         | 13 +++++++------
>  t/t2020-checkout-detach.sh |  2 +-
>  2 files changed, 8 insertions(+), 7 deletions(-)

The patch looks right to me.

-Peff