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: Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory Date: Mon, 26 Jan 2015 22:50:30 -0800 Organization: UCLA Computer Science Department Message-ID: <54C73536.3080009@cs.ucla.edu> References: <54C69627.60702@cs.ucla.edu> <54C72415.5080507@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050305040104010109030906" X-Trace: ger.gmane.org 1422341446 8244 80.91.229.3 (27 Jan 2015 06:50:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 27 Jan 2015 06:50:46 +0000 (UTC) Cc: Emacs Development To: sds@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 27 07:50:45 2015 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 1YFzz1-0003iI-S4 for ged-emacs-devel@m.gmane.org; Tue, 27 Jan 2015 07:50:44 +0100 Original-Received: from localhost ([::1]:45613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFzz1-0007Lh-5U for ged-emacs-devel@m.gmane.org; Tue, 27 Jan 2015 01:50:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFzyu-0007LT-KR for Emacs-devel@gnu.org; Tue, 27 Jan 2015 01:50:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFzyr-0000pt-9t for Emacs-devel@gnu.org; Tue, 27 Jan 2015 01:50:36 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:48613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFzyq-0000pd-RB; Tue, 27 Jan 2015 01:50:33 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id D48E2A60021; Mon, 26 Jan 2015 22:50:31 -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 yN3v6HmVN06M; Mon, 26 Jan 2015 22:50:31 -0800 (PST) Original-Received: from [192.168.1.9] (pool-173-55-11-52.lsanca.fios.verizon.net [173.55.11.52]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id D7760A6001C; Mon, 26 Jan 2015 22:50:30 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 In-Reply-To: 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:181825 Archived-At: This is a multi-part message in MIME format. --------------050305040104010109030906 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sam Steingold wrote: > .$ mkcd z > ./z [37]$ git init > Initialized empty Git repository in ./z/.git/ > ./z [38]$ ls -R .git/ > ... > .git//hooks: > total 40 > 8 ctags* 8 post-checkout* 8 post-commit* 8 post-merge* 8 post-rewrite* That's odd. It doesn't look like my .git/hooks at all. I wonder what other incompatibility bombs Apple has planted in their version of Git? I installed the attached patch to try to work around the incompatibility; please give it a try. --------------050305040104010109030906 Content-Type: text/x-patch; name="0001-Port-autogen.sh-hook-creation-to-Apple-Git.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Port-autogen.sh-hook-creation-to-Apple-Git.patch" >From 8dfe4398de6ffe3a2ab784f3146c2b8d95a21ff0 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 26 Jan 2015 22:34:25 -0800 Subject: [PATCH] Port autogen.sh hook creation to Apple Git * autogen.sh: Do not assume that the hook samples exist. This ports to git version 1.9.3 (Apple Git-50). For some reason Apple decided to populate the git hooks directory in a different way from the way that standard Git does it. The downside is that patch applications won't be checked on Apple, but that's better than autogen.sh failing. Problem reported by Sam Steingold in: http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00898.html --- ChangeLog | 12 ++++++++++++ autogen.sh | 1 + 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2ab8235..09a7968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2015-01-27 Paul Eggert + + Port autogen.sh hook creation to Apple Git + * autogen.sh: Do not assume that the hook samples exist. + This ports to git version 1.9.3 (Apple Git-50). + For some reason Apple decided to populate the git hooks directory + in a different way from the way that standard Git does it. + The downside is that patch applications won't be checked on Apple, + but that's better than autogen.sh failing. + Problem reported by Sam Steingold in: + http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00898.html + 2015-01-26 Paul Eggert * INSTALL.REPO: Mention minimum Git version. diff --git a/autogen.sh b/autogen.sh index c3ae1d7..bc9c5a0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -226,6 +226,7 @@ if test -d .git/hooks; then tailored_hooks="$tailored_hooks $hook" done for hook in applypatch-msg pre-applypatch; do + test ! -r .git/hooks/$hook.sample || cmp .git/hooks/$hook.sample .git/hooks/$hook >/dev/null 2>&1 || sample_hooks="$sample_hooks $hook" done -- 2.1.0 --------------050305040104010109030906--