Bug 265938 - git diff view broken if git is configured with color=always
Summary: git diff view broken if git is configured with color=always
Status: RESOLVED FIXED
Alias: None
Product: kdevplatform
Classification: Developer tools
Component: git (show other bugs)
Version: 1.2.0
Platform: openSUSE Linux
: NOR normal
Target Milestone: 1.2.0
Assignee: kdevelop-bugs-null
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-02-09 22:48 UTC by Rolf Eike Beer
Modified: 2011-02-28 08:56 UTC (History)
1 user (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Rolf Eike Beer 2011-02-09 22:48:13 UTC
Version:           1.2.0 (using KDE 4.6.0) 
OS:                Linux

My ~/.gitconfig contains

[diff]
        color = always

The escape codes for the colors generated by this command are not stripped when I try to do a review in KDevelop so the diff view is hardly readable and not correctly colored.

The git command should probably be called as "git diff --color=never".

Reproducible: Always
Comment 1 Andrey Batyiev 2011-02-28 02:09:57 UTC
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
Comment 2 Andrey Batyiev 2011-02-28 02:13:04 UTC
Git commit d03042c9907bb67f61717c8e32f1b555e48080cb by Andrey Batyiev.
Committed on 28/02/2011 at 02:08.
Pushed by abatyiev into branch 'master'.

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

Thanks to Michal Malek.

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

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

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