From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 14 May 2016 17:24:22 +0000 (-0700)
Subject: Port autogen.sh to Git 2.4
X-Git-Tag: emacs-26.0.90~1944
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91109821a2a190206d43db50605986e614b916f2;p=emacs.git

Port autogen.sh to Git 2.4

Problem reported by Michael Brand in:
http://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00367.html
* autogen.sh (git_config): Don't assume that git rev-parse
groks --git-common-dir.
---

diff --git a/autogen.sh b/autogen.sh
index 3809942acf4..b1bd86b4614 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.