diff options
| author | Xiaofeng Wang <wasphin@gmail.com> | 2019-01-25 08:46:12 +0800 |
|---|---|---|
| committer | Xiaofeng Wang <wasphin@gmail.com> | 2019-01-30 04:44:15 +0000 |
| commit | 6ae0e8d2c7f5d1bb3d3240bdfba3cd68eb093252 (patch) | |
| tree | 8e44f101b08fd49a7a9695c622370b39c4d1c401 /src/plugins/git | |
| parent | 4dd4d088c5514030bc1e6b088f582f9fc03c98b5 (diff) | |
Git: set git config diff.color to false
With diff.color=true, which seems the default or frequently used option,
the patch will contains color info. DiffUtils cannot handle this. So,
just turn off this option explicitly.
Change-Id: I8d8fe972655bea4d638cb34b897346c5b11d5abc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index e5b63feb22..0a55e0b56d 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -355,6 +355,8 @@ QStringList GitDiffEditorController::addConfigurationArguments(const QStringList QTC_ASSERT(!args.isEmpty(), return args); QStringList realArgs = { + "-c", + "diff.color=false", args.at(0), "-m", // show diff against parents instead of merge commits "-M", "-C", // Detect renames and copies |