summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAske Olsson <askeolsson@gmail.com>2012-05-10 12:13:43 +0200
committerPaul Mackerras <paulus@samba.org>2012-08-04 19:32:40 +1000
commit0ae103574e5411be107c31a3390884f65fbaa0ef (patch)
treede7adc72e6b481b3c6e7ff1ec4311ec64fdf2cf6
parenta135f214e371311f13807da637d492fd9642a2e3 (diff)
downloadgit-0ae103574e5411be107c31a3390884f65fbaa0ef.tar.gz
gitk: Fix GIT_TRACE issues
Check if GIT_TRACE env var is set and unset it if it is. If the environment var GIT_TRACE=1 exists gitk will fail when trying to find gitdir: $ git rev-parse --git-dir trace: built-in: git 'rev-parse' '--git-dir' .git Other git commands will also show debug output hence not work as intended. Signed-off-by: Aske Olsson <askeolsson@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rwxr-xr-xgitk5
1 files changed, 5 insertions, 0 deletions
diff --git a/gitk b/gitk
index 9bba9aa8d1..1f412bb5e5 100755
--- a/gitk
+++ b/gitk
@@ -11532,6 +11532,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"