summaryrefslogtreecommitdiff
path: root/gitk-git/gitk
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-12 16:32:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-12 16:32:22 (GMT)
commitcd82e584707bffdbb9553c6140e9a8fef130e5b8 (patch)
treea02f88249221eb7f91f0e79a8dedb03b3f9ebce8 /gitk-git/gitk
parentc528586a0cf0afc6aa18fbd060fa544e7e189c82 (diff)
parent5be4d354d9031bee65406608bfbdfc0fbc85abdb (diff)
downloadgit-cd82e584707bffdbb9553c6140e9a8fef130e5b8.zip
git-cd82e584707bffdbb9553c6140e9a8fef130e5b8.tar.gz
git-cd82e584707bffdbb9553c6140e9a8fef130e5b8.tar.bz2
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk: gitk: Fix GIT_TRACE issues
Diffstat (limited to 'gitk-git/gitk')
-rwxr-xr-xgitk-git/gitk5
1 files changed, 5 insertions, 0 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 6f24f53..d93bd99 100755
--- 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"