Fixing git checkout for good this time

CMakeLists.txt

@@ -654,7 +654,7 @@ include(GitExternal)
 git_external(concurrentqueue
     https://github.com/cameron314/concurrentqueue.git
     master
-    VERBOSE)
+    VERBOSE NO_UPDATE)
 
 find_file(
     CONCURRENTQUEUE_HEADER
@@ -670,19 +670,19 @@ else()
 endif()
 
 ### Set up perfstubs stuff
-git_external(perfstubs.git
+git_external(perfstubs
     https://github.com/khuck/perfstubs.git
     master
     VERBOSE)
 
 find_file(
     PERFSTUBS_HEADER
     NAMES perfstubs_api/tool.h
-    PATHS ${PROJECT_SOURCE_DIR}/perfstubs.git)
+    PATHS ${PROJECT_SOURCE_DIR}/perfstubs)
 
 if(PERFSTUBS_HEADER)
-    message(INFO " Found perfstubs at ${PROJECT_SOURCE_DIR}/perfstubs.git")
-    include_directories(${PROJECT_SOURCE_DIR}/perfstubs.git)
+    message(INFO " Found perfstubs at ${PROJECT_SOURCE_DIR}/perfstubs")
+    include_directories(${PROJECT_SOURCE_DIR}/perfstubs)
 else()
     message(FATAL_ERROR " perfstubs not found. This should have been checked out automatically. "
             "Try manually check out https://github.com/khuck/perfstubs.git to ${PROJECT_SOURCE_DIR}")

cmake/Modules/GitExternal.cmake

@@ -19,12 +19,12 @@
 #
 # [optional] Flags which control behaviour
 #  NO_UPDATE
-#    When set, GitExternal will not change a repo that has already been checked out. 
-#    The purpose of this is to allow one to set a default branch to be checked out, 
-#    but stop GitExternal from changing back to that branch if the user has checked 
+#    When set, GitExternal will not change a repo that has already been checked out.
+#    The purpose of this is to allow one to set a default branch to be checked out,
+#    but stop GitExternal from changing back to that branch if the user has checked
 #    out and is working on another.
-#  VERBOSE 
-#    When set, displays information about git commands that are executed  
+#  VERBOSE
+#    When set, displays information about git commands that are executed
 #
 
 find_package(Git)
@@ -101,15 +101,15 @@ function(GIT_EXTERNAL DIR REPO TAG)
       endif()
 
       # update tag
-#      GIT_EXTERNAL_MESSAGE("git rebase FETCH_HEAD")
-#      execute_process(COMMAND ${GIT_EXECUTABLE} rebase FETCH_HEAD
-#        RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE OUTPUT
-#        WORKING_DIRECTORY "${DIR}")
-#      if(RESULT)
-#        message(STATUS "git rebase failed, aborting ${DIR} merge")
-#        execute_process(COMMAND ${GIT_EXECUTABLE} rebase --abort
-#          WORKING_DIRECTORY "${DIR}")
-#      endif()
+      GIT_EXTERNAL_MESSAGE("git rebase FETCH_HEAD")
+      execute_process(COMMAND ${GIT_EXECUTABLE} rebase FETCH_HEAD
+        RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE OUTPUT
+        WORKING_DIRECTORY "${DIR}")
+      if(RESULT)
+        message(STATUS "git rebase failed, aborting ${DIR} merge")
+        execute_process(COMMAND ${GIT_EXECUTABLE} rebase --abort
+          WORKING_DIRECTORY "${DIR}")
+      endif()
 
     endif()
   else()