Skip to content
Permalink
Browse files

Merge pull request #2452 from oldium/fix-unset-env

git-gui: fix GIT_DIR handling for submodules

It would appear that
https://groups.google.com/d/msg/msysgit/FkdTopndAes/BRVBc95idk8J was
intended to supersede the patch `Revert "git-gui: set GIT_DIR and
GIT_WORK_TREE after setup"`, and it made it into Git's `master` via the
merge bd08ecc (Merge branch 'gb/maint-submodule-env' into maint,
2010-03-08) (the patch in question is 74ae141 (submodules: ensure
clean environment when operating in a submodule, 2010-02-25)).

Therefore, let's drop that patch (and the follow-up patch made necessary
by it) at long last -- after almost 10 years.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Jan 3, 2020
2 parents d16625c + 803e81e commit 79208035afdb095548daae82679b7942c6bb9579
Showing with 20 additions and 25 deletions.
  1. +20 −25 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,17 +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
} else {
unset env(GIT_DIR)
}
set env(GIT_DIR) $_gitdir
set env(GIT_WORK_TREE) $_gitworktree
cd $pwd
ui_status $::starting_gitk_msg
@@ -2237,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

0 comments on commit 7920803

Please sign in to comment.
You can’t perform that action at this time.