From: Jeff King <peff@peff.net>
To: Damien Robert <damien.olivier.robert+gmane@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Bug? ignored files overwritten by checkout
Date: Thu, 15 Aug 2013 08:06:58 -0400 [thread overview]
Message-ID: <20130815120658.GA22102@sigill.intra.peff.net> (raw)
In-Reply-To: <kuhsn7$84r$1@ger.gmane.org>
On Thu, Aug 15, 2013 at 06:33:11AM +0000, Damien Robert wrote:
> 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.
This is by design. Marking a file in .gitignore tells git that the
content is not precious and can be removed if need be. For most ignored
files, this is what you want (e.g., you mark "*.o" as ignored because it
is generated; you do not want to add it, and you can always make it
again).
The less common case is a file that is precious and needs to live inside
your repository directory, but which you do not want to add (e.g., a
config file that affects your project, but should not ever be
committed). People have occasionally asked for a .gitignore-like
mechanism to mark such files as "precious but do not add". However,
nobody has actually implemented anything.
-Peff
prev parent reply other threads:[~2013-08-15 12:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 6:33 Bug? ignored files overwritten by checkout Damien Robert
2013-08-15 12:06 ` Jeff King [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130815120658.GA22102@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).