[Emacs-diffs] master 9110982: Port autogen.sh to Git 2.4

[Paul Eggert]

branch: master
commit 91109821a2a190206d43db50605986e614b916f2
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 autogen.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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