X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c456627ffaf4e73e979883b56117cb91f164936b..1048151cc4bec79f7310f4f2ede309889822a6bb:/autogen.sh

diff --git a/autogen.sh b/autogen.sh
index cd0accd679..b1bd86b461 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -277,8 +277,10 @@ git_config ()
 # Get location of Git's common configuration directory.  For older Git
 # versions this is just '.git'.  Newer Git versions support worktrees.
 
-test -e .git && git_common_dir=`git rev-parse --git-common-dir 2>/dev/null` ||
-  git_common_dir=.git
+{ test -e .git &&
+  git_common_dir=`git rev-parse --no-flags --git-common-dir 2>/dev/null` &&
+  test -n "$git_common_dir"
+} || git_common_dir=.git
 hooks=$git_common_dir/hooks
 
 # Check hashes when transferring objects among repositories.
@@ -327,8 +329,9 @@ if test -n "$tailored_hooks$sample_hooks"; then
 
 	if test -n "$sample_hooks"; then
 	    for hook in $sample_hooks; do
-		cp $cp_options -- "$hooks/$hook.sample" "$hooks/$hook" || exit
-		chmod a-w .git/hooks/$hook || exit
+		dst=$hooks/$hook
+		cp $cp_options -- "$dst.sample" "$dst" || exit
+		chmod -- a-w "$dst" || exit
 	    done
 	fi
     else