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

* git://ozlabs.org/~paulus/gitk: gitk: Fix GIT_TRACE issues
Nov-Rabbit · Sep 12, 2012 · cd82e58 · cd82e58
2 parents c528586 + 5be4d35
commit cd82e58
Showing 1 changed file with 5 additions and 0 deletions.
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"