On Tue, May 23, 2017 at 11:17 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Ævar, > > On Mon, 22 May 2017, Ævar Arnfjörð Bjarmason wrote: > >> When I was adding the sha1collisiondetection submodule to git.git I >> noticed that building git would dirty the submodule. >> >> This is because our own Makefile adds .depend/ directories. I hacked >> around it by just getting the upstream project accept carrying an ignore >> rule for that around: >> https://github.com/cr-marcstevens/sha1collisiondetection/commit/e8397b26 >> >> A workaround for this is to have the Makefile add such a rule to >> .git/modules/sha1collisiondetection/info/exclude, but that's less >> convenient than being able to distribute it as a normal .gitignore rule. >> >> The submodule.<name>.ignore config provides an overly big hammer to >> solve this, it would be better if we had something like >> submodule.<name>.gitignore=<path>. Then we could have e.g. >> .gitignore.sha1collisiondetection which would be added to whatever rules >> the repo's own .gitignore provides. > > While I have nothing but the utmost respect for Stefan and Brandon for > trying to improve submodules, maybe it would be a wiser idea to imitate > the same strategy with sha1dc as we use with git-gui and gitk, i.e. > perform a subtree merge instead of adding it as a submodule. It's not like > 570kB will kill us.
The submodule/.gitignore bug/feature-request being reported here isn't something that impacts the ab/sha1dc series in practice. It was something I noticed while working with an earlier commit in that repo, but that's a commit that'll never be pinned by the git.git:sha1collisiondetection submodule.
