diff options
| author | lianah <lianahady@gmail.com> | 2013-03-21 11:41:39 -0400 |
|---|---|---|
| committer | lianah <lianahady@gmail.com> | 2013-03-21 11:41:39 -0400 |
| commit | 80697ed7280ac2462ec05e29754a0a563f19de44 (patch) | |
| tree | e247d9f4e031bba8ec03b0f972ae2af97d3c4312 /src/util/configuration.cpp | |
| parent | 6aa211751e7dc697035cf110c253cc36ace69066 (diff) | |
| parent | 80919c47ee899b85d626b0af923b77144b21e9f3 (diff) | |
Merge branch 'master' into bv-core
Diffstat (limited to 'src/util/configuration.cpp')
| -rw-r--r-- | src/util/configuration.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/util/configuration.cpp b/src/util/configuration.cpp index 9be4e4104..ce6273a13 100644 --- a/src/util/configuration.cpp +++ b/src/util/configuration.cpp @@ -216,8 +216,13 @@ std::string Configuration::getGitId() { return ""; } + const char* branchName = getGitBranchName(); + if(*branchName == '\0') { + branchName = "-"; + } + stringstream ss; - ss << "git " << getGitBranchName() << " " << string(getGitCommit()).substr(0, 8) + ss << "git " << branchName << " " << string(getGitCommit()).substr(0, 8) << ( ::CVC4::Configuration::hasGitModifications() ? " (with modifications)" : "" ); return ss.str(); } |