Skip to content

Commit 0ae1035

Browse files
dvaskepaulusmack
authored andcommitted
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 <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent a135f21 commit 0ae1035

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

gitk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11532,6 +11532,11 @@ if {[catch {package require Tk 8.4} err]} {
1153211532
exit 1
1153311533
}
1153411534

11535+
# Unset GIT_TRACE var if set
11536+
if { [info exists ::env(GIT_TRACE)] } {
11537+
unset ::env(GIT_TRACE)
11538+
}
11539+
1153511540
# defaults...
1153611541
set wrcomcmd "git diff-tree --stdin -p --pretty"
1153711542

0 commit comments

Comments
 (0)