Re: BUG: The .gitignore rules can't be made to cross submodule boundaries

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 23, 2017, 09:17 UTC
Message-ID: <alpine.DEB.2.21.1.1705231103220.3610@virtualbox>
In-Reply-To: <CACBZZX41yrAtBvkVeL9Q=2_TxcwrDXh55gu3qLN54P_go318OA@mail.gmail.com>

Hi Ævar,

On Mon, 22 May 2017, Ævar Arnfjörð Bjarmason wrote:

Show 17 quoted lines

> 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.

Ciao, Dscho