From: Michael J Gruber <git@drmicha.warpmail.net>
To: Bruce Stephens <bruce.stephens@isode.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: Change in "git checkout" behaviour between 1.6.0.2 and 1.6.0.3
Date: Wed, 12 Nov 2008 18:32:13 +0100 [thread overview]
Message-ID: <491B131D.2050501@drmicha.warpmail.net> (raw)
In-Reply-To: <80wsf9ovsp.fsf@tiny.isode.net>
Bruce Stephens venit, vidit, dixit 12.11.2008 15:36:
> The following works fine with 1.6.0.2 and before, but not 1.6.0.3 or
> later:
>
> git clone -n git git-test
> cd git-test
> git checkout -b work v1.6.0.2
>
> When it breaks, the error is:
>
> error: Entry '.gitignore' would be overwritten by merge. Cannot merge.
>
> I'm guessing it's a bug rather than a deliberate change?
Bisecting gives:
5521883490e85f4d973141972cf16f89a79f1979 is first bad commit
commit 5521883490e85f4d973141972cf16f89a79f1979
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Sep 7 19:49:25 2008 -0700
checkout: do not lose staged removal
CCing Junio...
Michael
next prev parent reply other threads:[~2008-11-12 17:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-12 14:36 Change in "git checkout" behaviour between 1.6.0.2 and 1.6.0.3 Bruce Stephens
2008-11-12 17:32 ` Michael J Gruber [this message]
2008-11-12 17:44 ` Bruce Stephens
2008-11-12 19:15 ` Junio C Hamano
2008-11-12 19:44 ` Bruce Stephens
2008-11-12 19:52 ` Re* " Junio C Hamano
2008-11-12 17:40 ` Bruce Stephens
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=491B131D.2050501@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=bruce.stephens@isode.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.