Port autogen.sh to Git 2.4

[gnu-emacs] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 3809942acf4bb27af3f740f9fc49ccc20c538543..b1bd86b461483ead5ed3c2a24e18dbd318c17f59 100755 (executable)
--- 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.