.gitignore and minimum Git version

.gitignore and minimum Git version

[Paul Eggert]

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

The first attached patch (recently applied to master) isn't needed for 
current versions of git, since the existing patterns 
lisp/**/*cus-load.el and lisp/**/*loaddefs.el subsume the newly added 
patterns.  Looking at the Git release notes, it appears that 
.gitignore's "**" feature was added in Git 1.8.2 (March 2013), so I 
guess Lars is using an older Git version and "**" didn't work for him.

Which raises the issue: what should be the minimum version of git that 
we assume for Emacs developers?  I suggest that we assume Git 1.7.1 
(April 2010) or later, as that's the oldest Git that is still likely to 
be in widespread use -- it's shipped with CentOS 6, for example.

One more thing: as I understand it, the .gitignore patch is needed on 
emacs-24 just as much as on master, and we're doing gittish stuff on 
both branches for now, so this sort of change should be applied to 
emacs-24 and later merged to master.  I attempted to address this by 
applying the second attached patch to the emacs-24 branch; this will 
need to be merged into the master .gitignore in due course.


[-- Attachment #2: emacs.diff --]
[-- Type: text/x-patch, Size: 742 bytes --]

diff --git a/.gitignore b/.gitignore
index 8e8a032..71ded39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,10 @@ src/globals.h
 leim/changed.misc
 leim/changed.tit
 lisp/**/*cus-load.el
+lisp/cus-load.el
 lisp/**/*loaddefs.el
+lisp/**/**/*loaddefs.el
+lisp/*loaddefs.el
 lisp/cedet/semantic/bovine/c-by.el
 lisp/cedet/semantic/bovine/make-by.el
 lisp/cedet/semantic/bovine/scm-by.el
diff --git a/ChangeLog b/ChangeLog
index a3c342c..cd7698c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* .gitignore: Ignore loaddefs directly under lisp, and in
+	sub-sub-directories.
+
 2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Add more of the old .bzrignore to .gitignore.

[-- Attachment #3: 0001-.gitignore-Avoid-as-it-requires-Git-1.8.2-or-later.patch --]
[-- Type: text/x-patch, Size: 1389 bytes --]

From 4a64715d15f028738d180d0b46071889bad15e1d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 1 Dec 2014 09:16:04 -0800
Subject: [PATCH] * .gitignore: Avoid "**", as it requires Git 1.8.2 or later.

---
 .gitignore | 9 +++++++--
 ChangeLog  | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3a9a9c..d40f09a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
+# Currently we assume only Git 1.7.1 (April 2010) or later, so this
+# file does not rely on "**" in patterns.  The "**" feature was added
+# in Git 1.8.2 (March 2013).
+
+
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
@@ -72,10 +77,10 @@ src/buildobj.h
 src/globals.h
 
 # Lisp-level sources built by 'make'.
+*cus-load.el
+*loaddefs.el
 leim/changed.misc
 leim/changed.tit
-lisp/**/*cus-load.el
-lisp/**/*loaddefs.el
 lisp/cedet/semantic/bovine/c-by.el
 lisp/cedet/semantic/bovine/make-by.el
 lisp/cedet/semantic/bovine/scm-by.el
diff --git a/ChangeLog b/ChangeLog
index 0cf1fe6..c70503c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2014-12-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* .gitignore: Remove redundant pattern (subsumed by _*).
+	Avoid "**", as it requires Git 1.8.2 or later.
 
 2014-11-21  Paul Eggert  <eggert@cs.ucla.edu>
 
-- 
1.9.3

Re: .gitignore and minimum Git version

[Eric S. Raymond]

Paul Eggert <eggert@cs.ucla.edu>:
> Which raises the issue: what should be the minimum version of git
> that we assume for Emacs developers?  I suggest that we assume Git
> 1.7.1 (April 2010) or later, as that's the oldest Git that is still
> likely to be in widespread use -- it's shipped with CentOS 6, for
> example.

I concur, 1.7.1 is a suitable baseline.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>