From: Craig Silverstein <csilvers@khanacademy.org>
To: git@vger.kernel.org
Subject: Bad interaction between git clean, gitignore, and deleted submodules
Date: Mon, 20 Nov 2017 16:02:25 -0800 [thread overview]
Message-ID: <CAGXKyzEbDxBkHeeiZAreGJDmoGR2quPi26R_COWnno_3-EcnmA@mail.gmail.com> (raw)
We have the following situation:
1) A .gitignore file that contains '*.pyc'
2) A repo with a submodule named jinja2
In normal use, clients of our repo have it checked out and run things
in it, creating files like jinja2/run.pyc.
I deleted the jinja2 submodule (by running `git rm jinja2` and
pushing). Clients did a `git pull; git submodule update` and saw that
the jinja2 directory was still around, albeit untracked. So they ran
`git clean -ffd`.
The problem is that git clean refuses to delete the directory due to
the (ignored and thus uncleanable) file jinja2/run.pyc. And when it
refuses to delete the directory, it also leaves around jinja2/.git.
Later, someone ran `git add .` and jinja2/.git got added back in as an
"orphaned submodule" (I forget the exact terminology). I know there's
a very loud warning when this happens but somehow they didn't see it,
and it caused all sorts of trouble when they pushed their change.
My question: is it possible for a client to *really* get rid of the
jinja2 submodule? We can't run `git clean -ffdx` because there are
other .gitignore'd files we want to keep around.
The behavior I'd like to see is for `git clean -ffd` to delete .git
files if they don't correspond to a currently registered submodule.
Then `git clean -ffd` would delete jinja2/.git even though it leaves
around jinja2/run.pyc. But I don't know if that would break anything
else.
Or maybe we should just add `.git` to our `.gitignore`, so people who
run `git add .` can't create these orphaned submodules...
craig
reply other threads:[~2017-11-21 0:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=CAGXKyzEbDxBkHeeiZAreGJDmoGR2quPi26R_COWnno_3-EcnmA@mail.gmail.com \
--to=csilvers@khanacademy.org \
--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).