diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-04 20:40:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-04 20:40:08 (GMT) |
| commit | 8106570606e79c8800eab048e7fcccba2c4ebee9 (patch) | |
| tree | 45cc976a07a9d29a3e192ca1a667c01efb7b7da1 /Source | |
| parent | caf3f07b834e466e34e7f5e0669208ce8e6e5151 (diff) | |
| parent | 78b81b773c428b6575ea50369a96e26fdfa586df (diff) | |
| download | CMake-8106570606e79c8800eab048e7fcccba2c4ebee9.zip CMake-8106570606e79c8800eab048e7fcccba2c4ebee9.tar.gz CMake-8106570606e79c8800eab048e7fcccba2c4ebee9.tar.bz2 | |
Merge topic 'ctest_update-Git-HEAD'
78b81b7 CTest: Fix ctest_update with 'HEAD' file in source tree
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestGIT.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx index 2c1a0af..5b34491 100644 --- a/Source/CTest/cmCTestGIT.cxx +++ b/Source/CTest/cmCTestGIT.cxx @@ -68,7 +68,7 @@ std::string cmCTestGIT::GetWorkingRevision() { // Run plumbing "git rev-list" to get work tree revision. const char* git = this->CommandLineTool.c_str(); - const char* git_rev_list[] = {git, "rev-list", "-n", "1", "HEAD", 0}; + const char* git_rev_list[] = {git, "rev-list", "-n", "1", "HEAD", "--", 0}; std::string rev; OneLineParser out(this, "rl-out> ", rev); OutputLogger err(this->Log, "rl-err> "); @@ -639,7 +639,7 @@ void cmCTestGIT::LoadModifications() this->RunChild(git_update_index, &ui_out, &ui_err); // Use 'git diff-index' to get modified files. - const char* git_diff_index[] = {git, "diff-index", "-z", "HEAD", 0}; + const char* git_diff_index[] = {git, "diff-index", "-z", "HEAD", "--", 0}; DiffParser out(this, "di-out> "); OutputLogger err(this->Log, "di-err> "); this->RunChild(git_diff_index, &out, &err); |