summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-06-24 14:41:20 (GMT)
committerBrad King <brad.king@kitware.com>2010-06-24 14:41:20 (GMT)
commit566bb2d0789b5ad8c65337eaee39c92e9a797608 (patch)
tree8ef833379f1add5a594c546197597ff09467e40d /Source/CTest
parentb86a551edee8d061989c4b2c25bdd09e5f9d3dec (diff)
parentbbfe241c6a4386a39ebb93cdb70a8390eab14eef (diff)
downloadCMake-566bb2d0789b5ad8c65337eaee39c92e9a797608.zip
CMake-566bb2d0789b5ad8c65337eaee39c92e9a797608.tar.gz
CMake-566bb2d0789b5ad8c65337eaee39c92e9a797608.tar.bz2
Merge branch 'ctest-git-empty-commits'
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestGIT.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 6c3631c..a49c852 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -317,8 +317,12 @@ protected:
\n
Log message indented by (4) spaces\n
(even blank lines have the spaces)\n
+ [[
\n
[Diff format]
+ OR
+ \0
+ ]]
The header may have more fields. See 'git help diff-tree'.
*/
@@ -372,6 +376,11 @@ private:
{
if(this->Line.empty())
{
+ if(this->Section == SectionBody && this->LineEnd == '\0')
+ {
+ // Skip SectionDiff
+ this->NextSection();
+ }
this->NextSection();
}
else