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]>

Author: max630

git-gui/git-gui.sh

@@ -2201,8 +2201,13 @@ proc do_gitk {revs {is_submodule false}} {
 		}
 		eval exec $cmd $revs "--" "--" &
 
-		set env(GIT_DIR) $_gitdir
-		set env(GIT_WORK_TREE) $_gitworktree
+		if {$old_GIT_DIR ne {}} {
+			set env(GIT_DIR) $old_GIT_DIR
+			set env(GIT_WORK_TREE) $_gitworktree
+		} else {
+			unset env(GIT_DIR)
+			unset env(GIT_WORK_TREE)
+		}
 		cd $pwd
 
 		ui_status $::starting_gitk_msg