[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdevplatform/1=2E2=5D_plugins/git=3A_Turn_off_color?=
From:       Andrey Batyiev <batyiev () gmail ! com>
Date:       2011-02-28 1:07:16
Message-ID: 20110228010716.6B776A609B () git ! kde ! org
[Download RAW message or body]

Git commit ef4bd3ad3d1dd3d2bc9054cffa30af8e97966399 by Andrey Batyiev.
Committed on 28/02/2011 at 02:01.
Pushed by abatyiev into branch '1.2'.

Turn off colored diff and external diff tool while doing "git diff".

Thanks to Michal Malek.

REVIEW: 100766
CCBUG: 265938
CCMAIL: michalm@jabster.pl

M  +1    -1    plugins/git/gitplugin.cpp     

http://commits.kde.org/kdevplatform/ef4bd3ad3d1dd3d2bc9054cffa30af8e97966399

diff --git a/plugins/git/gitplugin.cpp b/plugins/git/gitplugin.cpp
index ec630dd..88b32c0 100644
--- a/plugins/git/gitplugin.cpp
+++ b/plugins/git/gitplugin.cpp
@@ -328,7 +328,7 @@ VcsJob* GitPlugin::diff(const KUrl& fileOrDirectory, const KDevelop::VcsRevision
     //TODO: control different types
     
     DVcsJob* job = new GitJob(dotGitDirectory(fileOrDirectory), this);
-    *job << "git" << "diff" << "--no-prefix";
+    *job << "git" << "diff" << "--no-prefix" << "--no-color" << "--no-ext-diff";
     QString revstr = revisionInterval(srcRevision, dstRevision);
     if(!revstr.isEmpty())
         *job << revstr;

[prev in list] [next in list] [prev in thread] [next in thread]