From 6ae0e8d2c7f5d1bb3d3240bdfba3cd68eb093252 Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <wasphin@gmail.com>
Date: Fri, 25 Jan 2019 08:46:12 +0800
Subject: [PATCH] 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>
---
 src/plugins/git/gitclient.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index e5b63feb22f..0a55e0b56dc 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