All of lore.kernel.org
 help / color / mirror / Atom feed
From: Damien Robert <damien.olivier.robert+gmane@gmail.com>
To: git@vger.kernel.org
Subject: Bug? ignored files overwritten by checkout
Date: Thu, 15 Aug 2013 06:33:11 +0000 (UTC)	[thread overview]
Message-ID: <kuhsn7$84r$1@ger.gmane.org> (raw)


git init
git commit --allow-empty -m "init"
git checkout -b test
echo foo > foo
git add foo
git commit -am 'add foo'
git checkout master
echo 'Important data' > foo #[1]
echo foo > .gitignore
git checkout test

If I tried a `git checkout test` after [1], I would get the error message 
    error: The following untracked working tree files would be overwritten by checkout: foo
But after adding foo to .gitignore, I am able to checkout to branch test
without warning. Of course this overwrites foo to the version in test.

I tested this in version 1.8.3.4 and 1.7.10.4.

             reply	other threads:[~2013-08-15  6:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-15  6:33 Damien Robert [this message]
2013-08-15 12:06 ` Bug? ignored files overwritten by checkout Jeff King

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='kuhsn7$84r$1@ger.gmane.org' \
    --to=damien.olivier.robert+gmane@gmail.com \
    --cc=git@vger.kernel.org \
    /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.