diff --git a/CMake/FindGit.cmake b/CMake/FindGit.cmake
index e2fa61db14..5bc9acf228 100644
--- a/CMake/FindGit.cmake
+++ b/CMake/FindGit.cmake
@@ -1,80 +1,81 @@
 #
 # FindGit
 #
 
 set(git_candidates git eg)
 
 if(WIN32)
   list(APPEND git_candidates eg.cmd)
   if(NOT MSYS)
     # We don't append git.cmd, since it does not correctly return
     # exit codes, see http://code.google.com/p/msysgit/issues/detail?id=428
     list(APPEND git_candidates git.cmd)
   endif()
 endif()
 
 find_program(GIT_EXECUTABLE ${git_candidates}
   PATHS
     "C:/Program Files/Git/bin"
     "C:/Program Files (x86)/Git/bin"
   DOC "git command line client")
 mark_as_advanced(GIT_EXECUTABLE)
 
 if(GIT_EXECUTABLE)
 
   macro(GIT_IS_REPO dir result_var)
-    execute_process(COMMAND ${GIT_EXECUTABLE} status
+    # check if ${dir} is a proper Git repository
+    execute_process(COMMAND ${GIT_EXECUTABLE} rev-list -n 1 HEAD
        WORKING_DIRECTORY ${dir}
        RESULT_VARIABLE GIT_error
        OUTPUT_QUIET
        ERROR_QUIET)
     if(GIT_error EQUAL 0)
       set(${result_var} 1)
     else()
       set(${result_var} 0)
     endif()
   endmacro()
 
   macro(GIT_WC_INFO dir prefix)
     execute_process(COMMAND ${GIT_EXECUTABLE} rev-list -n 1 HEAD
        WORKING_DIRECTORY ${dir}
        ERROR_VARIABLE GIT_error
        OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH
        OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(NOT ${GIT_error} EQUAL 0)
       message(SEND_ERROR "Command \"${GIT_EXECUTBALE} rev-list -n 1 HEAD\" in directory ${dir} failed with output:\n${GIT_error}")
     else()
       execute_process(COMMAND ${GIT_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH}
          WORKING_DIRECTORY ${dir}
          OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME
           OUTPUT_STRIP_TRAILING_WHITESPACE)
     endif()
 
     set(${prefix}_WC_GITSVN 0)
     # In case, git-svn is used, attempt to extract svn info
     execute_process(COMMAND ${GIT_EXECUTABLE} svn info
       WORKING_DIRECTORY ${dir}
       ERROR_VARIABLE git_svn_info_error
       OUTPUT_VARIABLE ${prefix}_WC_INFO
       RESULT_VARIABLE git_svn_info_result
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     if(${git_svn_info_result} EQUAL 0)
       set(${prefix}_WC_GITSVN 1)
       string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
         "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}")
       string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
         "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
       string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
         "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
       string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
         "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
       string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
         "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
     endif()
 
   endmacro()
 endif()
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Git DEFAULT_MSG GIT_EXECUTABLE)