View Issue Details Jump to Notes ] Print ]
IDProjectCategoryView StatusDate SubmittedLast Update
0010662CMakeCTestpublic2010-05-03 15:062010-05-04 10:11
ReporterKen Moreland 
Assigned ToBrad King 
PrioritynormalSeverityminorReproducibilityhave not tried
StatusclosedResolutionfixed 
PlatformOSOS Version
Product Version 
Target VersionFixed in Version 
Summary0010662: CTEST_UPDATE does not completely update with git submodules
DescriptionWhen CTEST_UPDATE is run on a git repository that contains submodules, it often reports a conflict in the repository even though no files are edited. The problem occurs when the repository has submodules and the git pull merges a change in the commit SHA of the submodule. The SHA gets updated fine, but the files in the submodule remain at the old commit (as per the expected behavior of git pull). Because the submodule repository is at a different commit than the repository is supposed to be at, the conflict is reported by git status.

The resolution is simple: call git submodule update. However, there is no mechanism in CTest to do this easily. You cannot call it before the CTEST_UPDATE, because you don't have the new SHA yet. You can't call it after CTEST_UPDATE, because by then CTest has already recorded the error. CTEST_UPDATE needs to be able to call git submodule update internally.
Additional InformationSee this email thread for a workaround: http://public.kitware.com/pipermail/paraview-developers/2010-April/000690.html [^]
TagsNo tags attached.
Attached Files

 Relationships

  Notes
(0020528)
Brad King (manager)
2010-05-04 10:11

Fixed:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67277bac [^]

We'll include this in CMake 2.8.2.

 Issue History
Date Modified Username Field Change
2010-05-03 15:06 Ken Moreland New Issue
2010-05-03 17:48 Bill Hoffman Status new => assigned
2010-05-03 17:48 Bill Hoffman Assigned To => Brad King
2010-05-04 10:11 Brad King Note Added: 0020528
2010-05-04 10:11 Brad King Status assigned => closed
2010-05-04 10:11 Brad King Resolution open => fixed


Copyright © 2000 - 2018 MantisBT Team