From: Aske Olsson <askeolsson@gmail.com>
Date: Thu, 10 May 2012 10:13:43 +0000 (+0200)
Subject: gitk: Fix GIT_TRACE issues
X-Git-Tag: v1.8.0-rc0~73^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ae103574e5411be107c31a3390884f65fbaa0ef;p=git.git

gitk: Fix GIT_TRACE issues

Check if GIT_TRACE env var is set and unset it if it is.

If the environment var GIT_TRACE=1 exists gitk will fail when trying
to find gitdir:
$ git rev-parse --git-dir
trace: built-in: git 'rev-parse' '--git-dir'
.git

Other git commands will also show debug output hence not work as
intended.

Signed-off-by: Aske Olsson <askeolsson@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 9bba9aa8d..1f412bb5e 100755
--- a/gitk
+++ b/gitk
@@ -11532,6 +11532,11 @@ if {[catch {package require Tk 8.4} err]} {
     exit 1
 }
 
+# Unset GIT_TRACE var if set
+if { [info exists ::env(GIT_TRACE)] } {
+    unset ::env(GIT_TRACE)
+}
+
 # defaults...
 set wrcomcmd "git diff-tree --stdin -p --pretty"