Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

dscho · Git for Windows Build Agent · commit f4f0dd298b1e · 2020-01-02T23:35:28.000Z
git-gui: correctly restore GIT_DIR after invoking commands
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -2214,6 +2214,8 @@ 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
 

Original file line number	Diff line number	Diff line change
`@@ -2214,6 +2214,8 @@ proc do_gitk {revs {is_submodule false}} {`
`2214`	`2214`
`2215`	`2215`	`if {$old_GIT_DIR ne {}} {`
`2216`	`2216`	`set env(GIT_DIR) $old_GIT_DIR`
	`2217`	`+ } else {`
	`2218`	`+ unset env(GIT_DIR)`
`2217`	`2219`	`}`
`2218`	`2220`	`cd $pwd`
`2219`	`2221`