diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-12 09:32:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 09:32:22 -0700 |
commit | cd82e584707bffdbb9553c6140e9a8fef130e5b8 (patch) | |
tree | a02f88249221eb7f91f0e79a8dedb03b3f9ebce8 /gitk-git | |
parent | c528586a0cf0afc6aa18fbd060fa544e7e189c82 (diff) | |
parent | 5be4d354d9031bee65406608bfbdfc0fbc85abdb (diff) | |
download | git-cd82e584707bffdbb9553c6140e9a8fef130e5b8.tar.gz |
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk:
gitk: Fix GIT_TRACE issues
Diffstat (limited to 'gitk-git')
-rwxr-xr-x | gitk-git/gitk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index 6f24f53d21..d93bd990a9 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" |