Skip to content

Commit 52b0022

Browse files
max630dscho
authored andcommitted
git-gui: correctly restore GIT_DIR after invoking gitk
git-gui tries to temporary set GIT_DIR for starting gitk and restore it back after they are started. But in case of GIT_DIR which was not set prior to invocation it is not unset after it. This affects commands which can be later started from that git gui, for example "Git Bash". Fix it. Signed-off-by: Max Kirillov <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4dc0d87 commit 52b0022

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

git-gui/git-gui.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2208,6 +2208,8 @@ proc do_gitk {revs {is_submodule false}} {
22082208
22092209
if {$old_GIT_DIR ne {}} {
22102210
set env(GIT_DIR) $old_GIT_DIR
2211+
} else {
2212+
unset env(GIT_DIR)
22112213
}
22122214
cd $pwd
22132215

0 commit comments

Comments
 (0)