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

* git://ozlabs.org/~paulus/gitk: gitk: Fix GIT_TRACE issues

Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk: gitk: Fix GIT_TRACE issues
cd82e584 · Junio C Hamano · c528586a · 5be4d354 · cd82e584
隐藏空白更改
内联并排

Showing with 5 addition and 0 deletion

gitk-git/gitk gitk-git/gitk +5 -0

未找到文件。
--- 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"