[Emacs-diffs] master 589094a: Port autogen.sh hook creation to Apple Git

[Paul Eggert]

branch: master
commit 589094a48966583f6b428d89807f504f5401b4ed
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ab8235..09a7968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-01-27  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * 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