git-gui: correctly restore GIT_DIR after invoking commands #1032

max630 · 2017-01-17T15:56:13Z

git-gui tries to temporary set GIT_DIR for running commands
and restore it back after it started. But in case of GIT_DIR which was
not set prior to invocation it is not unset after it.

Fix it.

Signed-off-by: Max Kirillov [email protected]

PhilipOakley · 2017-01-17T19:56:34Z

looks sensible to me.
Should this PR also go to https://github.com/patthoyts/git-gui ?

max630 · 2017-01-18T04:40:59Z

Should this PR also go to https://github.com/patthoyts/git-gui ?

The patch is not directly applicable to that repository, as well as to the main git's one. Though they would also have the issue that they leak the environment to shell. But is should be fixed in other place.

git-gui/git-gui.sh

@@ -2203,6 +2203,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)


git-gui/git-gui.sh

@@ -2239,6 +2241,8 @@ proc do_git_gui {} {

 		if {$old_GIT_DIR ne {}} {
 			set env(GIT_DIR) $old_GIT_DIR
+		} else {
+			unset env(GIT_DIR)


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

dscho · 2017-01-19T15:57:05Z

Thank you!

git-gui: correctly restore GIT_DIR after invoking commands

Git GUI will [no longer set `GIT_DIR` when calling Git Bash after visualizing the commit history](git-for-windows/git#1032). Signed-off-by: Johannes Schindelin <[email protected]>

git-gui: correctly restore GIT_DIR after invoking commands

max630 force-pushed the gitgui_GIT_GIT_unset branch from 0742cc2 to 66e912a Compare January 17, 2017 18:33

dscho requested changes Jan 18, 2017

View reviewed changes

max630 force-pushed the gitgui_GIT_GIT_unset branch from 66e912a to 5bd3bbf Compare January 18, 2017 19:01

dscho approved these changes Jan 19, 2017

View reviewed changes

dscho merged commit 86d49cc into git-for-windows:master Jan 19, 2017

dscho added this to the v2.11.1 milestone Jan 19, 2017

dscho added a commit that referenced this pull request Jan 24, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

d0e066d

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Jan 24, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

c153422

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Jan 25, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

4c80902

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Jan 25, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

68652ec

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Jan 25, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

c1ea71a

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Jan 25, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

3abb048

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit to dscho/git that referenced this pull request Feb 1, 2017

Merge pull request git-for-windows#1032 from max630/gitgui_GIT_GIT_unset

fd85c21

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 2, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

489933d

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Feb 2, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

d9fd0bc

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 2, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

47fcc46

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 2, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

87cfd99

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Feb 2, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

13a05f5

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 3, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

2fd85b7

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 4, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

e74a657

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 4, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

953e89b

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 4, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

36956b3

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit to dscho/git that referenced this pull request Feb 4, 2017

Merge pull request git-for-windows#1032 from max630/gitgui_GIT_GIT_unset

cbe12be

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Feb 21, 2017

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

2318a50

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 11, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

20b05de

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 13, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

2bbba4c

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 13, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

5ecd019

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 13, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

5f36e04

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 14, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

a578cfb

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 16, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

049e69f

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 16, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

a8b586e

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 16, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

17f1c7e

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 18, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

2c6d82f

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 18, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

8a3a571

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 21, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

e0d6a96

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 21, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

9b9637e

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 24, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

2545b98

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 25, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

181a69e

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 26, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

83f99fb

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 26, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

a1f311b

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit to dscho/git that referenced this pull request Dec 26, 2019

Merge pull request git-for-windows#1032 from max630/gitgui_GIT_GIT_unset

265a278

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 29, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

da0da61

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit that referenced this pull request Dec 29, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

5ddbac4

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 30, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

85e5b63

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Dec 30, 2019

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

bdb9c17

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2020

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

09544f3

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2020

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

f4f0dd2

git-gui: correctly restore GIT_DIR after invoking commands

git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2020

Merge pull request #1032 from max630/gitgui_GIT_GIT_unset

0ae2ee3

git-gui: correctly restore GIT_DIR after invoking commands

dscho added a commit to dscho/git that referenced this pull request Jan 3, 2020

Merge pull request git-for-windows#1032 from max630/gitgui_GIT_GIT_unset

fdbd8f2

git-gui: correctly restore GIT_DIR after invoking commands

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

git-gui: correctly restore GIT_DIR after invoking commands #1032

git-gui: correctly restore GIT_DIR after invoking commands #1032

max630 commented Jan 17, 2017 •

edited

Loading

PhilipOakley commented Jan 17, 2017

max630 commented Jan 18, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

dscho commented Jan 19, 2017

git-gui: correctly restore GIT_DIR after invoking commands #1032

git-gui: correctly restore GIT_DIR after invoking commands #1032

Conversation

max630 commented Jan 17, 2017 • edited Loading

PhilipOakley commented Jan 17, 2017

max630 commented Jan 18, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

dscho commented Jan 19, 2017

max630 commented Jan 17, 2017 •

edited

Loading