unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
@ 2015-01-26 16:48 Sam Steingold
  2015-01-26 19:31 ` Paul Eggert
  0 siblings, 1 reply; 14+ messages in thread
From: Sam Steingold @ 2015-01-26 16:48 UTC (permalink / raw)
  To: emacs-devel

Hi
The current git tip fails for me:

--8<---------------cut here---------------start------------->8---
$ make bootstrap
....
cd .. && ./autogen.sh
Checking whether you have the necessary tools...
(Read INSTALL.REPO for more details on building Emacs)

Checking for autoconf (need at least version 2.65)...
ok
Checking for automake (need at least version 1.11)...
ok
Your system has the required tools.
Running 'autoreconf -fi -I m4' ...
Installing git hooks...
cp: .git/hooks/applypatch-msg.sample: No such file or directory
make: *** [bootstrap] Error 1
--8<---------------cut here---------------end--------------->8---

what is this hook?
why do I need it?
where do I get it?
why is it not explained in INSTALL.REPO?

thanks

-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://www.dhimmitude.org http://think-israel.org
http://ffii.org http://iris.org.il http://camera.org http://truepeace.org
Never argue with an idiot, listeners may not be able to tell the difference.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-26 16:48 make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory Sam Steingold
@ 2015-01-26 19:31 ` Paul Eggert
  2015-01-27  2:25   ` Sam Steingold
  0 siblings, 1 reply; 14+ messages in thread
From: Paul Eggert @ 2015-01-26 19:31 UTC (permalink / raw)
  To: sds, emacs-devel

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

On 01/26/2015 08:48 AM, Sam Steingold wrote:
> Running 'autoreconf -fi -I m4' ...
> Installing git hooks...
> cp: .git/hooks/applypatch-msg.sample: No such file or directory

My guess is that the repository was created by an older version of Git.  
Git versions before 1.6.0 didn't create .sample files for hooks.

In previous discussion about this, we thought it OK to require Git 
version 1.7.1 (April 2010) or later; see the (admittedly short) thread 
at 
<http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00037.html>. 
If this needs to be revisited, now's as good a time as any to do that.

> what is this hook?
> why do I need it?
> where do I get it?
> why is it not explained in INSTALL.REPO?

It's a hook for when you apply patches from other developers.  The 
simplest thing to solve just this problem, assuming you're running a 
recent-enough Git, is to reclone the repository from scratch.  You 
should be able to patch an existing repository built with an older Git 
by running 'chmod a+x .git/hooks/applypatch-msg 
.git/hooks/pre-applypatch; cp .git/hooks/applypatch-msg 
.git/hooks/applypatch-msg.sample; cp .git/hooks/pre-applypatch 
.git/hooks/pre-applypatch.sample' (though I haven't tested this).

I installed the attached patch to INSTALL.REPO to try to help clarify 
the situation a bit.


[-- Attachment #2: 0001-INSTALL.REPO-Mention-minimum-Git-version.patch --]
[-- Type: text/x-patch, Size: 1160 bytes --]

From 81f7fcb4b8a4f370162def4fd42fd62674db96a5 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Jan 2015 11:21:45 -0800
Subject: [PATCH] * INSTALL.REPO: Mention minimum Git version.

---
 ChangeLog    | 4 ++++
 INSTALL.REPO | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index eecdad6..2ab8235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* INSTALL.REPO: Mention minimum Git version.
+
 2015-01-25  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use gnustep-config if available
diff --git a/INSTALL.REPO b/INSTALL.REPO
index df997fb..3431ee4 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -12,6 +12,8 @@ autoconf  - at least the version specified near the start of
   configure.ac (in the AC_PREREQ command).
 automake  - at least the version specified near the start of
   configure.ac (in the AM_INIT_AUTOMAKE command).
+git - at least Git 1.7.1.  If your repository was created by an older
+  Git version, you may need to reclone it.
 makeinfo  - not strictly necessary, but highly recommended, so that
   you can build the manuals.
 
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-26 19:31 ` Paul Eggert
@ 2015-01-27  2:25   ` Sam Steingold
  2015-01-27  5:37     ` Paul Eggert
  0 siblings, 1 reply; 14+ messages in thread
From: Sam Steingold @ 2015-01-27  2:25 UTC (permalink / raw)
  To: emacs-devel

> * Paul Eggert <rttreg@pf.hpyn.rqh> [2015-01-26 11:31:51 -0800]:
>
> On 01/26/2015 08:48 AM, Sam Steingold wrote:
>> Running 'autoreconf -fi -I m4' ...
>> Installing git hooks...
>> cp: .git/hooks/applypatch-msg.sample: No such file or directory
>
> My guess is that the repository was created by an older version of Git.
> Git versions before 1.6.0 didn't create .sample files for hooks.

this is certainly not my case.
I have git version 1.9.3 (Apple Git-50)

> reclone the repository from scratch.

just did, and...


$ ./autogen.sh 
Checking whether you have the necessary tools...
(Read INSTALL.REPO for more details on building Emacs)

Checking for autoconf (need at least version 2.65)...
ok
Checking for automake (need at least version 1.11)...
ok
Your system has the required tools.
Running 'autoreconf -fi -I m4' ...
cd -
configure.ac:760: installing 'build-aux/compile'
configure.ac:139: installing 'build-aux/config.guess'
configure.ac:139: installing 'build-aux/config.sub'
configure.ac:136: installing 'build-aux/install-sh'
configure.ac:136: installing 'build-aux/missing'
lib/Makefile.am: installing 'build-aux/depcomp'
Installing git hooks...
cp: .git/hooks/applypatch-msg.sample: No such file or directory
$


> You should be able to patch an existing repository built with an older
> Git by running 'chmod a+x .git/hooks/applypatch-msg
> .git/hooks/pre-applypatch; cp .git/hooks/applypatch-msg
> .git/hooks/applypatch-msg.sample; cp .git/hooks/pre-applypatch
> .git/hooks/pre-applypatch.sample' (though I haven't tested this).

emacs$ ls -R .git/hooks/
total 56
8 commit-msg* 8 ctags* 8 post-checkout* 8 post-commit* 8 post-merge*
8 post-rewrite* 8 pre-commit*



-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://honestreporting.com
http://camera.org http://www.memritv.org http://dhimmi.org
People hear what they want to hear and discard the rest.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27  2:25   ` Sam Steingold
@ 2015-01-27  5:37     ` Paul Eggert
  2015-01-27  5:46       ` Sam Steingold
  0 siblings, 1 reply; 14+ messages in thread
From: Paul Eggert @ 2015-01-27  5:37 UTC (permalink / raw)
  To: sds, emacs-devel

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

Sam Steingold wrote:
> this is certainly not my case.
> I have git version 1.9.3 (Apple Git-50)

Unfortunately I cannot reproduce the problem with git 1.9.3 (which I just now 
built from source on Fedora 21 x86-64).  Please see the attached transcript.  I 
can reproduce the problem with git 1.5.6.6 but that's so old that we don't 
support it.

How did you clone your copy of Emacs?

If you run the following commands on your host, what's the output?

$ git --version
git version 1.9.3
$ mkdir newdir
$ cd newdir
$ git init
Initialized empty Git repository in /home/eggert/junk/newdir/.git/
$ ls -l .git/hooks
total 40
-rwxr-xr-x. 1 eggert eggert  452 Jan 26 21:34 applypatch-msg.sample
-rwxr-xr-x. 1 eggert eggert  896 Jan 26 21:34 commit-msg.sample
-rwxr-xr-x. 1 eggert eggert  189 Jan 26 21:34 post-update.sample
-rwxr-xr-x. 1 eggert eggert  398 Jan 26 21:34 pre-applypatch.sample
-rwxr-xr-x. 1 eggert eggert 1642 Jan 26 21:34 pre-commit.sample
-rwxr-xr-x. 1 eggert eggert 1239 Jan 26 21:34 prepare-commit-msg.sample
-rwxr-xr-x. 1 eggert eggert 1352 Jan 26 21:34 pre-push.sample
-rwxr-xr-x. 1 eggert eggert 4951 Jan 26 21:34 pre-rebase.sample
-rwxr-xr-x. 1 eggert eggert 3611 Jan 26 21:34 update.sample


[-- Attachment #2: transcript.txt --]
[-- Type: text/plain, Size: 2069 bytes --]

980-Penguin $ git --version
git version 1.9.3
980-Penguin $ git clone git://git.savannah.gnu.org/emacs.git
Cloning into 'emacs'...
remote: Counting objects: 720838, done.
remote: Compressing objects: 100% (132536/132536), done.
remote: Total 720838 (delta 589155), reused 719010 (delta 587631)
Receiving objects: 100% (720838/720838), 189.95 MiB | 226.00 KiB/s, done.
Resolving deltas: 100% (589155/589155), done.
Checking connectivity... done.
981-Penguin $ cd emacs
982-Penguin $ ls -l .git/hooks
total 40
-rwxr-xr-x. 1 eggert eggert  452 Jan 26 20:44 applypatch-msg.sample
-rwxr-xr-x. 1 eggert eggert  896 Jan 26 20:44 commit-msg.sample
-rwxr-xr-x. 1 eggert eggert  189 Jan 26 20:44 post-update.sample
-rwxr-xr-x. 1 eggert eggert  398 Jan 26 20:44 pre-applypatch.sample
-rwxr-xr-x. 1 eggert eggert 1642 Jan 26 20:44 pre-commit.sample
-rwxr-xr-x. 1 eggert eggert 1239 Jan 26 20:44 prepare-commit-msg.sample
-rwxr-xr-x. 1 eggert eggert 1352 Jan 26 20:44 pre-push.sample
-rwxr-xr-x. 1 eggert eggert 4951 Jan 26 20:44 pre-rebase.sample
-rwxr-xr-x. 1 eggert eggert 3611 Jan 26 20:44 update.sample
983-Penguin $ ./autogen.sh
Checking whether you have the necessary tools...
(Read INSTALL.REPO for more details on building Emacs)

Checking for autoconf (need at least version 2.65)...
ok
Checking for automake (need at least version 1.11)...
ok
Your system has the required tools.
Running 'autoreconf -fi -I m4' ...
configure.ac:760: installing 'build-aux/compile'
configure.ac:139: installing 'build-aux/config.guess'
configure.ac:139: installing 'build-aux/config.sub'
configure.ac:136: installing 'build-aux/install-sh'
configure.ac:136: installing 'build-aux/missing'
lib/Makefile.am: installing 'build-aux/depcomp'
Installing git hooks...
‘build-aux/git-hooks/commit-msg’ -> ‘.git/hooks/commit-msg’
‘build-aux/git-hooks/pre-commit’ -> ‘.git/hooks/pre-commit’
‘.git/hooks/applypatch-msg.sample’ -> ‘.git/hooks/applypatch-msg’
‘.git/hooks/pre-applypatch.sample’ -> ‘.git/hooks/pre-applypatch’
You can now run './configure'.
984-Penguin $

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27  5:37     ` Paul Eggert
@ 2015-01-27  5:46       ` Sam Steingold
  2015-01-27  6:50         ` Paul Eggert
  0 siblings, 1 reply; 14+ messages in thread
From: Sam Steingold @ 2015-01-27  5:46 UTC (permalink / raw)
  To: emacs-devel

> * Paul Eggert <rttreg@pf.hpyn.rqh> [2015-01-26 21:37:25 -0800]:
>
> Sam Steingold wrote:
>> this is certainly not my case.
>> I have git version 1.9.3 (Apple Git-50)
>
> Unfortunately I cannot reproduce the problem with git 1.9.3 (which I
> just now built from source on Fedora 21 x86-64).  Please see the
> attached transcript.  I can reproduce the problem with git 1.5.6.6 but
> that's so old that we don't support it.
>
> How did you clone your copy of Emacs?

the exact same commands as yours:

.$ mkcd z
./z [37]$ git init
Initialized empty Git repository in ./z/.git/
./z [38]$ ls -R .git/
total 16
8 HEAD		8 config	0 hooks/	0 objects/	0 refs/

.git//hooks:
total 40
8 ctags*		8 post-checkout*	8 post-commit*		8 post-merge*		8 post-rewrite*

.git//objects:
total 0
0 info/	0 pack/

.git//objects/info:

.git//objects/pack:

.git//refs:
total 0
0 heads/	0 tags/

.git//refs/heads:

.git//refs/tags:
./z [39]$ 


> 980-Penguin $ git --version

the only difference is that I use mac


-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://camera.org http://ffii.org http://truepeace.org
http://dhimmi.org http://www.dhimmitude.org http://think-israel.org
Of course, I haven't tried it. But it will work.    - Isaak Asimov




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27  5:46       ` Sam Steingold
@ 2015-01-27  6:50         ` Paul Eggert
  2015-01-27  7:57           ` chad
                             ` (2 more replies)
  0 siblings, 3 replies; 14+ messages in thread
From: Paul Eggert @ 2015-01-27  6:50 UTC (permalink / raw)
  To: sds; +Cc: Emacs Development

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

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.


[-- Attachment #2: 0001-Port-autogen.sh-hook-creation-to-Apple-Git.patch --]
[-- Type: text/x-patch, Size: 1926 bytes --]

From 8dfe4398de6ffe3a2ab784f3146c2b8d95a21ff0 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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  <eggert@cs.ucla.edu>
+
+	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  <eggert@cs.ucla.edu>
 
 	* 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


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27  6:50         ` Paul Eggert
@ 2015-01-27  7:57           ` chad
  2015-01-27  9:11           ` Jan D.
  2015-01-27 17:53           ` Sam Steingold
  2 siblings, 0 replies; 14+ messages in thread
From: chad @ 2015-01-27  7:57 UTC (permalink / raw)
  To: Paul Eggert; +Cc: sds, Emacs Development

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


> On 26 Jan 2015, at 22:50, Paul Eggert <eggert@cs.ucla.edu> wrote:
> 
> 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.

If I try the same thing under macosx 10.10:

; /usr/bin/git init
Initialized empty Git repository in /private/tmp/testgit/.git/
; ls -R
[...]
./hooks:
applypatch-msg.sample		pre-push.sample
commit-msg.sample		pre-rebase.sample
post-update.sample		prepare-commit-msg.sample
pre-applypatch.sample		update.sample
pre-commit.sample
; /usr/bin/git --version
git version 1.9.3 (Apple Git-50)

I ran /usr/bin/git because I also have 2.2.2 installed in /usr/local.

Hope that helps,
~Chad


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

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27  6:50         ` Paul Eggert
  2015-01-27  7:57           ` chad
@ 2015-01-27  9:11           ` Jan D.
  2015-01-27 17:39             ` Eli Zaretskii
  2015-01-27 17:53           ` Sam Steingold
  2 siblings, 1 reply; 14+ messages in thread
From: Jan D. @ 2015-01-27  9:11 UTC (permalink / raw)
  To: Paul Eggert, sds; +Cc: Emacs Development

Paul Eggert skrev den 2015-01-27 07:50:
> 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?

FWIW, no git repository I have on OSX (2 machines about 20 repositories) 
has this layout.  This is what they have:

% ls .git/hooks/
applypatch-msg.sample*     pre-push.sample*
commit-msg.sample*         pre-rebase.sample*
post-update.sample*        prepare-commit-msg.sample*
pre-applypatch.sample*     update.sample*
pre-commit.sample*

% git --version
git version 1.9.3 (Apple Git-50)

I think this is a local problem, not a general one.

	Jan D.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27  9:11           ` Jan D.
@ 2015-01-27 17:39             ` Eli Zaretskii
  2015-01-27 18:07               ` Jan D.
  2015-01-27 21:09               ` Sam Steingold
  0 siblings, 2 replies; 14+ messages in thread
From: Eli Zaretskii @ 2015-01-27 17:39 UTC (permalink / raw)
  To: Jan D.; +Cc: sds, eggert, Emacs-devel

> Date: Tue, 27 Jan 2015 10:11:52 +0100
> From: "Jan D." <jan.h.d@swipnet.se>
> Cc: Emacs Development <Emacs-devel@gnu.org>
> 
> Paul Eggert skrev den 2015-01-27 07:50:
> > 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?
> 
> FWIW, no git repository I have on OSX (2 machines about 20 repositories) 
> has this layout.  This is what they have:
> 
> % ls .git/hooks/
> applypatch-msg.sample*     pre-push.sample*
> commit-msg.sample*         pre-rebase.sample*
> post-update.sample*        prepare-commit-msg.sample*
> pre-applypatch.sample*     update.sample*
> pre-commit.sample*
> 
> % git --version
> git version 1.9.3 (Apple Git-50)
> 
> I think this is a local problem, not a general one.

It's beginning to sound like one.

So maybe something happened to /usr/share/git-core/templates/hooks
directory (or wherever it is on OS X) on Sam's machine.  What do you
(Sam) see there?

Or maybe Sam has an alias that calls "git init" with --template
option, pointing it to  a non-standard place.  (What does
"git config -l" display?)

Or maybe GIT_TEMPLATE_DIR is set in the environment on Sam's machine.

Or something similar.



^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27  6:50         ` Paul Eggert
  2015-01-27  7:57           ` chad
  2015-01-27  9:11           ` Jan D.
@ 2015-01-27 17:53           ` Sam Steingold
  2 siblings, 0 replies; 14+ messages in thread
From: Sam Steingold @ 2015-01-27 17:53 UTC (permalink / raw)
  To: emacs-devel

> * Paul Eggert <rttreg@pf.hpyn.rqh> [2015-01-26 22:50:30 -0800]:
>
> 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?

1. I installed git 2.2.2 from homebrew:

$ mkcd z ; /usr/local/bin/git --version; /usr/local/bin/git init; cd ..; rm -rfv z
git version 2.2.2
Initialized empty Git repository in ...../z/.git/
z/.git/config
z/.git/HEAD
z/.git/hooks/ctags
z/.git/hooks/post-checkout
z/.git/hooks/post-commit
z/.git/hooks/post-merge
z/.git/hooks/post-rewrite
z/.git/hooks
z/.git/objects/info
z/.git/objects/pack
z/.git/objects
z/.git/refs/heads
z/.git/refs/tags
z/.git/refs
z/.git
z

2. CentOS release 6.4 (Final)

$ mkcd z; git --version; git init; cd ..; rm -rfv z
git version 1.7.1
warning: templates not found /home/sam/.git-templates
Initialized empty Git repository in ...../z/.git/
removed directory: `z/.git/refs/heads'
removed directory: `z/.git/refs/tags'
removed directory: `z/.git/refs'
removed `z/.git/HEAD'
removed `z/.git/config'
removed directory: `z/.git/objects/info'
removed directory: `z/.git/objects/pack'
removed directory: `z/.git/objects'
removed directory: `z/.git'
removed directory: `z'

3. Ubuntu 14.04.1 LTS

$ mkcd z; git --version; git init; cd ..; rm -rfv z
git version 1.9.1
Initialized empty Git repository in /home/sds/z/.git/
removed directory: ‘z/.git/objects/info’
removed directory: ‘z/.git/objects/pack’
removed directory: ‘z/.git/objects’
removed ‘z/.git/HEAD’
removed ‘z/.git/config’
removed directory: ‘z/.git/refs/heads’
removed directory: ‘z/.git/refs/tags’
removed directory: ‘z/.git/refs’
removed ‘z/.git/hooks/post-checkout’
removed ‘z/.git/hooks/post-rewrite’
removed ‘z/.git/hooks/ctags’
removed ‘z/.git/hooks/post-commit’
removed ‘z/.git/hooks/post-merge’
removed directory: ‘z/.git/hooks’
removed directory: ‘z/.git’
removed directory: ‘z’

4. fencepost.gnu.org

$ mkcd z; git --version; git init; cd ..; rm -rfv z
git version 2.2.2
Initialized empty Git repository in /srv/data/home/s/sds/z/.git/
removed `z/.git/info/exclude'
removed directory: `z/.git/info'
removed directory: `z/.git/objects/info'
removed directory: `z/.git/objects/pack'
removed directory: `z/.git/objects'
removed `z/.git/description'
removed directory: `z/.git/branches'
removed `z/.git/HEAD'
removed `z/.git/config'
removed directory: `z/.git/refs/heads'
removed directory: `z/.git/refs/tags'
removed directory: `z/.git/refs'
removed `z/.git/hooks/update.sample'
removed `z/.git/hooks/applypatch-msg.sample'
removed `z/.git/hooks/prepare-commit-msg.sample'
removed `z/.git/hooks/post-update.sample'
removed `z/.git/hooks/pre-push.sample'
removed `z/.git/hooks/pre-commit.sample'
removed `z/.git/hooks/pre-applypatch.sample'
removed `z/.git/hooks/commit-msg.sample'
removed `z/.git/hooks/pre-rebase.sample'
removed directory: `z/.git/hooks'
removed directory: `z/.git'
removed directory: `z'

so, it appears that the only installation which has those sample scripts
is the gnu box.

-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://camera.org http://americancensorship.org
http://honestreporting.com http://think-israel.org http://jihadwatch.org
90% of female beauty is male imagination.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27 17:39             ` Eli Zaretskii
@ 2015-01-27 18:07               ` Jan D.
  2015-01-27 20:59                 ` Sam Steingold
  2015-01-27 21:09               ` Sam Steingold
  1 sibling, 1 reply; 14+ messages in thread
From: Jan D. @ 2015-01-27 18:07 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: sds, Emacs-devel, eggert

Hi.

> 27 jan 2015 kl. 18:39 skrev Eli Zaretskii <eliz@gnu.org>:
> 
>> Date: Tue, 27 Jan 2015 10:11:52 +0100
>> From: "Jan D." <jan.h.d@swipnet.se>
>> Cc: Emacs Development <Emacs-devel@gnu.org>
>> 
>> Paul Eggert skrev den 2015-01-27 07:50:
>>> 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?
>> 
>> FWIW, no git repository I have on OSX (2 machines about 20 repositories) 
>> has this layout.  This is what they have:
>> 
>> % ls .git/hooks/
>> applypatch-msg.sample*     pre-push.sample*
>> commit-msg.sample*         pre-rebase.sample*
>> post-update.sample*        prepare-commit-msg.sample*
>> pre-applypatch.sample*     update.sample*
>> pre-commit.sample*
>> 
>> % git --version
>> git version 1.9.3 (Apple Git-50)
>> 
>> I think this is a local problem, not a general one.
> 
> It's beginning to sound like one.
> 
> So maybe something happened to /usr/share/git-core/templates/hooks
> directory (or wherever it is on OS X) on Sam's machine.  What do you
> (Sam) see there?

/Applications/Xcode.app//Contents/Developer/usr/share/git-core/templates/hooks

	Jan D.

> 
> Or maybe Sam has an alias that calls "git init" with --template
> option, pointing it to  a non-standard place.  (What does
> "git config -l" display?)
> 
> Or maybe GIT_TEMPLATE_DIR is set in the environment on Sam's machine.
> 
> Or something similar.




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27 18:07               ` Jan D.
@ 2015-01-27 20:59                 ` Sam Steingold
  0 siblings, 0 replies; 14+ messages in thread
From: Sam Steingold @ 2015-01-27 20:59 UTC (permalink / raw)
  To: emacs-devel

Hi,

I have the same problem on Ubuntu and CentOS.

> * Jan D. <wna.u.q@fjvcarg.fr> [2015-01-27 19:07:18 +0100]:
>
> /Applications/Xcode.app//Contents/Developer/usr/share/git-core/templates/hooks

no such directory.
neither usr/share/git*


-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://camera.org http://think-israel.org
http://ffii.org http://jihadwatch.org http://mideasttruth.com
Two magic words will open almost all doors for you: "pull" and "push".




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27 17:39             ` Eli Zaretskii
  2015-01-27 18:07               ` Jan D.
@ 2015-01-27 21:09               ` Sam Steingold
  2015-01-27 22:44                 ` Paul Eggert
  1 sibling, 1 reply; 14+ messages in thread
From: Sam Steingold @ 2015-01-27 21:09 UTC (permalink / raw)
  To: emacs-devel

> * Eli Zaretskii <ryvm@tah.bet> [2015-01-27 19:39:21 +0200]:
>
> So maybe something happened to /usr/share/git-core/templates/hooks
> directory (or wherever it is on OS X) on Sam's machine.  What do you
> (Sam) see there?

$ ls /usr/local/share/git-core/templates/hooks/
total 80
 8 applypatch-msg.sample*	 8 post-update.sample*		 8 pre-commit.sample*		16 pre-rebase.sample*		 8 update.sample*
 8 commit-msg.sample*		 8 pre-applypatch.sample*	 8 pre-push.sample*		 8 prepare-commit-msg.sample*

> Or maybe Sam has an alias that calls "git init" with --template
> option, pointing it to  a non-standard place.  (What does
> "git config -l" display?)

aha!!!
I do have

--8<---------------cut here---------------start------------->8---
[init]
	templatedir = ~/.git-templates
--8<---------------cut here---------------end--------------->8---

in .gitconfig; removing it fixed the problem.
Sorry.

Now, the reason I have the .git-templates is to call ctags after each
git operation; I thought that those things were cumulative with the
system-provided git hooks.

I wonder if I can keep my ctags hooks and get the new git *.sample
scripts too.

Thanks!

-- 
Sam Steingold (http://sds.podval.org/) on darwin Ns 10.3.1343
http://www.childpsy.net/ http://truepeace.org http://camera.org
http://thereligionofpeace.com http://ffii.org http://memri.org
-Nervous?  -Yes!  -First time?  -No, I've been nervous before!




^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory
  2015-01-27 21:09               ` Sam Steingold
@ 2015-01-27 22:44                 ` Paul Eggert
  0 siblings, 0 replies; 14+ messages in thread
From: Paul Eggert @ 2015-01-27 22:44 UTC (permalink / raw)
  To: sds, emacs-devel

On 01/27/2015 01:09 PM, Sam Steingold wrote:
> I wonder if I can keep my ctags hooks and get the new git *.sample
> scripts too.

Maybe something like 'ln -s /usr/local/share/git-core/templates/hooks/* 
~/.git-templates'?  (Or 'cp' if 'ln -s' doesn't suffice.)  This is 
brittle in case a later Git version adds more standard templates, but it 
should be better than what you've got now.

I updated the ChangeLog entry for the autogen.sh change, to reflect the 
new diagnosis of the actual problem.



^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2015-01-27 22:44 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-26 16:48 make bootstrap fails: cp: .git/hooks/applypatch-msg.sample: No such file or directory Sam Steingold
2015-01-26 19:31 ` Paul Eggert
2015-01-27  2:25   ` Sam Steingold
2015-01-27  5:37     ` Paul Eggert
2015-01-27  5:46       ` Sam Steingold
2015-01-27  6:50         ` Paul Eggert
2015-01-27  7:57           ` chad
2015-01-27  9:11           ` Jan D.
2015-01-27 17:39             ` Eli Zaretskii
2015-01-27 18:07               ` Jan D.
2015-01-27 20:59                 ` Sam Steingold
2015-01-27 21:09               ` Sam Steingold
2015-01-27 22:44                 ` Paul Eggert
2015-01-27 17:53           ` Sam Steingold

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.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).