From: Nevada Sanchez <sanchez.nevada@gmail.com>
To: git@vger.kernel.org
Subject: Bug with .gitignore and branch switching
Date: Fri, 17 Mar 2017 16:42:35 -0400 [thread overview]
Message-ID: <CAPUVn2u0Uos2mT5+4ejj8m0okNK6XwerL6ce2miHfhtuEs-ZnQ@mail.gmail.com> (raw)
Here's an easy to reproduce bug. It's the only example I know of where
git legitimately loses data in a way that is unrecoverable,
unexpected, and without warning.
```
git --version
# git version 2.12.0
mkdir git-demo
cd git-demo
git init
# Commit a file that will end up in .gitignore
echo 'original settings' > mine.conf
git add mine.conf
git commit -m "Unknowingly committed my settings."
echo '*.conf' > .gitignore
git add .gitignore
git commit -m "Users shouldn't commit their settings"
# Spin off a feature branch here (but don't check it out)
git branch feature
# Realize that we don't want that file committed
git rm mine.conf
git commit -m "Delete mine.conf"
echo 'Lots of laboriously tuned settings' > mine.conf
# Hop on the feature branch to do some work
git checkout feature
# Hmmm... My settings are gone
cat mine.conf
# original settings
# Lemme hop back
git checkout master
# Wait... they are gone for good!
cat mine.conf
# cat: mine.conf: No such file or directory
```
next reply other threads:[~2017-03-17 21:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 20:42 Nevada Sanchez [this message]
2017-03-17 21:23 ` Bug with .gitignore and branch switching Junio C Hamano
2017-03-17 21:58 ` Stefan Beller
2017-03-17 22:02 ` Jonathan Nieder
2017-03-17 22:36 ` Junio C Hamano
2017-03-18 3:40 ` Duy Nguyen
2017-03-18 4:30 ` Nevada Sanchez
2017-03-17 21:54 ` Jonathan Nieder
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=CAPUVn2u0Uos2mT5+4ejj8m0okNK6XwerL6ce2miHfhtuEs-ZnQ@mail.gmail.com \
--to=sanchez.nevada@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).