... on a fresh repository obtained by 'git clone --recursive'.
* import-gnulib.sh (check_old_gnulib_dir_layout): Do not require
./gnulib/.git to be a directory.
---
 ChangeLog        |    7 +++++++
 import-gnulib.sh |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bdc656..c61da2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-03  Kamil Dudka  <kdu...@redhat.com>
+
+       Eliminate a misleading message of import-gnulib.sh on a fresh
+       repository obtained by 'git clone --recursive'.
+       * import-gnulib.sh (check_old_gnulib_dir_layout): Do not require
+       ./gnulib/.git to be a directory.
+
 2013-02-03  James Youngman  <j...@gnu.org>
 
        * po/findutils.pot: Updated template file from the Translation
diff --git a/import-gnulib.sh b/import-gnulib.sh
index 9912e09..073ddb0 100755
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -346,7 +346,7 @@ EOF
        # No ./gl/ and no ./gnulib-git/.   If ./gnulib/ exists, it might
        # be either.   If there is no ./gnulib/ we are safe to proceed anyway.
        if test -d ./gnulib/; then
-           if test -d ./gnulib/.git; then
+           if test -e ./gnulib/.git; then
                # Looks like it is the submodule.
                true
            else
-- 
1.7.1


Reply via email to