소스 검색

BUG: Updated QtMobilityGitBranch1.0-patch.cmake.in - "git add --all" is now invoked

The last step of the patch process is now "git add --all", that way future
git pull called will be able to eventually merge the patched files with the fetched ones.
Jean-Christophe Fillion-Robin 15 년 전
부모
커밋
fa616ad159
1개의 변경된 파일9개의 추가작업 그리고 0개의 파일을 삭제
  1. 9 0
      Utilities/QtMobility/QtMobilityGitBranch1.0-patch.cmake.in

+ 9 - 0
Utilities/QtMobility/QtMobilityGitBranch1.0-patch.cmake.in

@@ -62,3 +62,12 @@ IF(UNIX)
     MESSAGE(FATAL_ERROR "Patching ${proj_dir}/configure file failed.")
   ENDIF()
 ENDIF()
+
+# Let's add the updated files to the local repository. That way, 'git pull'
+# will try to merge the branch changes with the local ones
+execute_process(
+  COMMAND @Git_EXECUTABLE@ add --all
+  WORKING_DIRECTORY ${proj_dir}
+  ERROR_VARIABLE error_output
+  RESULT_VARIABLE error_code
+  )