Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

dscho · dscho · commit 36956b3673ce · 2017-02-04T08:46:47.000+01:00
git-gui: correctly restore GIT_DIR after invoking commands
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -2209,6 +2209,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
`@@ -2209,6 +2209,8 @@ proc do_gitk {revs {is_submodule false}} {`
`2209`	`2209`
`2210`	`2210`	`if {$old_GIT_DIR ne {}} {`
`2211`	`2211`	`set env(GIT_DIR) $old_GIT_DIR`
	`2212`	`+ } else {`
	`2213`	`+ unset env(GIT_DIR)`
`2212`	`2214`	`}`
`2213`	`2215`	`cd $pwd`
`2214`	`2216`