From dcb1beaff713722cd3947e8e53e5d5bfcb305ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= Date: Fri, 3 Jan 2020 22:03:41 +0100 Subject: [PATCH 1/2] Revert "git-gui: correctly restore GIT_DIR after invoking gitk" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a9af64ee54c9ff70508c848809b3edb9db4caf48. Signed-off-by: Oldřich Jedlička --- git-gui/git-gui.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 92be959588fcd3..d41d8383f00f71 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -2214,8 +2214,6 @@ proc do_gitk {revs {is_submodule false}} { if {$old_GIT_DIR ne {}} { set env(GIT_DIR) $old_GIT_DIR - } else { - unset env(GIT_DIR) } cd $pwd From 803e81e939be2ea2f110127b1a3cbc9c7f513dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= Date: Fri, 3 Jan 2020 22:04:02 +0100 Subject: [PATCH 2/2] Revert "Revert "git-gui: set GIT_DIR and GIT_WORK_TREE after setup"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ca2f9322876b7d3633ff3e8d03af9d43bf43b164. Signed-off-by: Oldřich Jedlička --- git-gui/git-gui.sh | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index d41d8383f00f71..2eb5d74fe78020 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -1335,6 +1335,9 @@ if {[lindex $_reponame end] eq {.git}} { set _reponame [lindex $_reponame end] } +set env(GIT_DIR) $_gitdir +set env(GIT_WORK_TREE) $_gitworktree + ###################################################################### ## ## global init @@ -2161,7 +2164,7 @@ set starting_gitk_msg [mc "Starting gitk... please wait..."] proc do_gitk {revs {is_submodule false}} { global current_diff_path file_states current_diff_side ui_index - global _gitworktree + global _gitdir _gitworktree # -- Always start gitk through whatever we were loaded with. This # lets us bypass using shell process on Windows systems. @@ -2173,19 +2176,12 @@ proc do_gitk {revs {is_submodule false}} { } else { global env - if {[info exists env(GIT_DIR)]} { - set old_GIT_DIR $env(GIT_DIR) - } else { - set old_GIT_DIR {} - } - set pwd [pwd] if {!$is_submodule} { if {![is_bare]} { cd $_gitworktree } - set env(GIT_DIR) [file normalize [gitdir]] } else { cd $current_diff_path if {$revs eq {--}} { @@ -2206,15 +2202,18 @@ proc do_gitk {revs {is_submodule false}} { } set revs $old_sha1...$new_sha1 } - if {[info exists env(GIT_DIR)]} { - unset env(GIT_DIR) - } + # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones + # we've been using for the main repository, so unset them. + # TODO we could make life easier (start up faster?) for gitk + # by setting these to the appropriate values to allow gitk + # to skip the heuristics to find their proper value + unset env(GIT_DIR) + unset env(GIT_WORK_TREE) } eval exec $cmd $revs "--" "--" & - if {$old_GIT_DIR ne {}} { - set env(GIT_DIR) $old_GIT_DIR - } + set env(GIT_DIR) $_gitdir + set env(GIT_WORK_TREE) $_gitworktree cd $pwd ui_status $::starting_gitk_msg @@ -2235,22 +2234,20 @@ proc do_git_gui {} { error_popup [mc "Couldn't find git gui in PATH"] } else { global env + global _gitdir _gitworktree - if {[info exists env(GIT_DIR)]} { - set old_GIT_DIR $env(GIT_DIR) - unset env(GIT_DIR) - } else { - set old_GIT_DIR {} - } + # see note in do_gitk about unsetting these vars when + # running tools in a submodule + unset env(GIT_DIR) + unset env(GIT_WORK_TREE) set pwd [pwd] cd $current_diff_path eval exec $exe gui & - if {$old_GIT_DIR ne {}} { - set env(GIT_DIR) $old_GIT_DIR - } + set env(GIT_DIR) $_gitdir + set env(GIT_WORK_TREE) $_gitworktree cd $pwd ui_status $::starting_gitk_msg