From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Brandon Williams <bmwill@google.com>,
Stefan Beller <sbeller@google.com>
Subject: Re: BUG: The .gitignore rules can't be made to cross submodule boundaries
Date: Tue, 23 May 2017 11:17:28 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1705231103220.3610@virtualbox> (raw)
In-Reply-To: <CACBZZX41yrAtBvkVeL9Q=2_TxcwrDXh55gu3qLN54P_go318OA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]
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.
Ciao,
Dscho
next prev parent reply other threads:[~2017-05-23 9:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-22 18:33 BUG: The .gitignore rules can't be made to cross submodule boundaries Ævar Arnfjörð Bjarmason
2017-05-23 9:17 ` Johannes Schindelin [this message]
2017-05-23 9:55 ` Ævar Arnfjörð Bjarmason
2017-05-23 17:51 ` Stefan Beller
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=alpine.DEB.2.21.1.1705231103220.3610@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/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).