From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: .gitignore and minimum Git version Date: Mon, 01 Dec 2014 09:24:35 -0800 Organization: UCLA Computer Science Department Message-ID: <547CA453.6010706@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020104090002050606000001" X-Trace: ger.gmane.org 1417454714 16808 80.91.229.3 (1 Dec 2014 17:25:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Dec 2014 17:25:14 +0000 (UTC) Cc: "Eric S. Raymond" , Lars Magne Ingebrigtsen To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 01 18:25:07 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XvUig-00066l-FV for ged-emacs-devel@m.gmane.org; Mon, 01 Dec 2014 18:25:06 +0100 Original-Received: from localhost ([::1]:32923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvUig-0005XQ-2V for ged-emacs-devel@m.gmane.org; Mon, 01 Dec 2014 12:25:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvUiX-0005VL-77 for emacs-devel@gnu.org; Mon, 01 Dec 2014 12:25:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XvUiR-0002MC-VT for emacs-devel@gnu.org; Mon, 01 Dec 2014 12:24:57 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:60315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvUiR-0002L2-NB for emacs-devel@gnu.org; Mon, 01 Dec 2014 12:24:51 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 35E24A60037; Mon, 1 Dec 2014 09:24:44 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b+P-lJdjvKDU; Mon, 1 Dec 2014 09:24:39 -0800 (PST) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id C6410A60038; Mon, 1 Dec 2014 09:24:38 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178602 Archived-At: This is a multi-part message in MIME format. --------------020104090002050606000001 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit 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. --------------020104090002050606000001 Content-Type: text/x-patch; name="emacs.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="emacs.diff" 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 + + * .gitignore: Ignore loaddefs directly under lisp, and in + sub-sub-directories. + 2014-11-29 Paul Eggert Add more of the old .bzrignore to .gitignore. --------------020104090002050606000001 Content-Type: text/x-patch; name="0001-.gitignore-Avoid-as-it-requires-Git-1.8.2-or-later.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-.gitignore-Avoid-as-it-requires-Git-1.8.2-or-later.patc"; filename*1="h" >From 4a64715d15f028738d180d0b46071889bad15e1d Mon Sep 17 00:00:00 2001 From: Paul Eggert 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 . +# 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 * .gitignore: Remove redundant pattern (subsumed by _*). + Avoid "**", as it requires Git 1.8.2 or later. 2014-11-21 Paul Eggert -- 1.9.3 --------------020104090002050606000001--