bug#35945: 27.0.50; .gitignore: Bad specification for .dir-locals-2.el file

bug#35945: 27.0.50; .gitignore: Bad specification for .dir-locals-2.el file

[Mauro Aranda]

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

Hello.

In the Git repository, we have a .dir-locals.el tracked file.  According
to the Emacs manual, a .dir-locals-2.el file can be used for personal
customizations, and it is useful when .dir-locals.el is under VC.  So,
the .dir-locals-2.el file shouldn't be tracked.

But if I do the following in the Emacs Git repository:
$ touch .dir-locals-2.el
$ git status

I can see that .dir-locals-2.el is not ignored.

Best regards,
Mauro.

[-- Attachment #2: Type: text/html, Size: 545 bytes --]

bug#35945: 27.0.50; .gitignore: Bad specification for .dir-locals-2.el file

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 70 bytes --]

Thanks for reporting the problem; I installed the attached to fix it.

[-- Attachment #2: 0001-Fix-.gitignore-spec-for-personal-customizations.patch --]
[-- Type: text/x-patch, Size: 792 bytes --]

From 5ad5c4ac991bc2b35a4a92e22f17a5a73009d7bc Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 1 Jun 2019 18:33:55 -0700
Subject: [PATCH] Fix .gitignore spec for personal customizations

Problem reported by Mauro Aranda (Bug#35945).
* .gitignore: Replace .dir-locals?.el with .dir-locals-2.el.
---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 88b29760b7..e75df8b8b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@
 # in Git 1.8.2 (March 2013).
 
 
+# Personal customization.
+.dir-locals-2.el
+
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
@@ -256,7 +259,6 @@ gnustmp*
 ChangeLog
 [0-9]*.patch
 [0-9]*.txt
-.dir-locals?.el
 /vc-dwim-log-*
 
 # Built by 'make install'.
-- 
2.17.1