diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-03-17 12:36:55 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-03-17 12:36:55 +0100 |
| commit | 465bf149d5c1dbb142ffd81bcab234716192cdee (patch) | |
| tree | 96fb65b838d140825c1ee7530b26fc3e7b9c22e2 /src/plugins/git/branchmodel.cpp | |
| parent | 8e0fb8ba9a4bc58fdcc4fe1c6dbf6d7dfbddb160 (diff) | |
| download | qt-creator-465bf149d5c1dbb142ffd81bcab234716192cdee.tar.gz | |
Fixes: Using a git configuration with colored output breaks much of the git plugin.
Task: 248067
Details: Use --no-color where appropriate. Use a hack to remove color sequences from output for "status" since it does not support the option as of git 1.6.2.
Diffstat (limited to 'src/plugins/git/branchmodel.cpp')
| -rw-r--r-- | src/plugins/git/branchmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 9c778555d9..23c597b204 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -109,7 +109,8 @@ bool RemoteBranchModel::refreshBranches(const QString &workingDirectory, bool re int *currentBranch, QString *errorMessage) { // Run branch command with verbose. - QStringList branchArgs(QLatin1String("-v")); + QStringList branchArgs; + branchArgs << QLatin1String(GitClient::noColorOption) << QLatin1String("-v"); QString output; *currentBranch = -1; if (remoteBranches) |