summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorLibravatar Sam Vilain <sam.vilain@catalyst.net.nz>2007-10-17 11:33:04 +1300
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-10-17 03:44:28 -0400
commit0166419a197cea0ceef3aed8c72023deb015ecf4 (patch)
treeaeb7d10a776a98a05e67b2ba140e39c7159a18d7 /gitk
parentgitk: Fix bug causing undefined variable error when cherry-picking (diff)
downloadtgif-0166419a197cea0ceef3aed8c72023deb015ecf4.tar.xz
gitk: disable colours when calling git log
If the user specifies 'diff.color = 1' in their configuration file, then gitk will not start. Disable colours when calling git log. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitk b/gitk
index 300fdceb35..999e3c2188 100755
--- a/gitk
+++ b/gitk
@@ -92,7 +92,7 @@ proc start_rev_list {view} {
set order "--date-order"
}
if {[catch {
- set fd [open [concat | git log -z --pretty=raw $order --parents \
+ set fd [open [concat | git log --no-color -z --pretty=raw $order --parents \
--boundary $viewargs($view) "--" $viewfiles($view)] r]
} err]} {
error_popup "Error executing git rev-list: $err"