From 4124dc8714f0d6e8f9b19cc138d630291292a846 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Thu, 17 Mar 2016 18:30:02 +0900
Subject: improve git repository detection

* configure.in (AC_CONFIG_FILES): $srcdir/.git can be a file pointing
  the real git_dir, such as when the git working tree is a "linked
  working tree" (a working tree created by git-worktree). So use
  git-rev-parse --git-dir to check if $srcdir is the top-level of a git
  repository, not just checking if the $srcdir/.git directory does exist
  or not.
* tool/change_maker.rb: use tool/vcs.rb to detect VCS. This used to have
  its own VCS detection code, while we have tool/vcs.rb.
* tool/vcs.rb (detect): remove code duplication
---
 configure.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index a96ed71344..b32187bee9 100644
--- a/configure.in
+++ b/configure.in
@@ -4464,10 +4464,12 @@ AC_CONFIG_FILES(Makefile, [
 	    :
 	elif svn info "$srcdir" > /dev/null 2>&1; then
 	    VCS='svn'
-	elif test -d "$srcdir/.git/svn"; then
-	    VCS='git svn'
-	elif test -d "$srcdir/.git"; then
-	    VCS='git'
+	elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then
+	    if test -d "$git_dir/svn"; then
+		VCS='git svn'
+	    else
+		VCS='git'
+	    fi
 	else
 	    VCS='echo cannot'
 	fi
-- 
cgit v1.2.3