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

* git://ozlabs.org/~paulus/gitk: gitk: Fix GIT_TRACE issues
13 years ago · cd82e58470
1 changed files with 5 additions and 0 deletions
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@ -11533,6 +11533,11 @@ if {[catch {package require Tk 8.4} err]} {
				@@ -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"