Merge git://ozlabs.org/~paulus/gitk

gitster · gitster · commit cd82e584707b · 2012-09-12T09:32:22.000-07:00
* git://ozlabs.org/~paulus/gitk:
  gitk: Fix GIT_TRACE issues
diff --git a/gitk-git/gitk b/gitk-git/gitk
@@ -11533,6 +11533,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"
 
