X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0d7b2c96d388f5a9b539df3cb7f4ef115e7010b7..edae7d93ed509aa8a7db3952c70550cf3353d169:/autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 614bdc71b6..a63c53c903 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### autogen.sh - tool to help build Emacs from a repository checkout
 
-## Copyright (C) 2011-2014 Free Software Foundation, Inc.
+## Copyright (C) 2011-2016 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
 ## Maintainer: emacs-devel@gnu.org
@@ -216,8 +216,20 @@ autoreconf -fi -I m4 || exit $?
 ## cause 'make' to needlessly run 'autoheader'.
 echo timestamp > src/stamp-h.in || exit
 
-## Install Git hooks, if using Git.
-if test -d .git/hooks; then
+
+## Configure Git, if using Git.
+if test -d .git && (git status -s) >/dev/null 2>&1; then
+
+    # Configure 'git diff' hunk header format.
+
+    git config 'diff.elisp.xfuncname' \
+	'^\(def[^[:space:]]+[[:space:]]+([^()[:space:]]+)' || exit
+    git config 'diff.texinfo.xfuncname' \
+	'^@node[[:space:]]+([^,[:space:]][^,]+)' || exit
+
+
+    # Install Git hooks.
+
     tailored_hooks=
     sample_hooks=
 
@@ -226,6 +238,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
@@ -237,7 +250,7 @@ if test -d .git/hooks; then
 	  *--backup*--verbose*)
 	    cp_options='--backup=numbered --verbose';;
 	  *)
-	    cp_options='';;
+	    cp_options='-f';;
 	esac
 
 	if test -n "$tailored_hooks"; then