summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-19 23:06:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-19 23:06:51 (GMT)
commit98cedd0233ee88e69711f79d1126b6bd772ff5bd (patch)
tree54a5e5c17d069d5d5ac3283d38a892c3e010d0a4 /git-gui/git-gui.sh
parent7fcb9659703b9dd611acb7cb85752be8ba4dcf31 (diff)
parenta5728022e07c53e5ac91db0960870518e243b7c1 (diff)
downloadgit-98cedd0233ee88e69711f79d1126b6bd772ff5bd.zip
git-98cedd0233ee88e69711f79d1126b6bd772ff5bd.tar.gz
git-98cedd0233ee88e69711f79d1126b6bd772ff5bd.tar.bz2
Merge https://github.com/prati0100/git-gui
* 'master' of https://github.com/prati0100/git-gui: git-gui: create a new namespace for chord script evaluation git-gui: reduce Tcl version requirement from 8.6 to 8.5 git-gui--askpass: coerce answers to UTF-8 on Windows git-gui: fix error popup when doing blame -> "Show History Context" git-gui: add missing close bracket git-gui: update German translation git-gui: extend translation glossary template with more terms git-gui: update pot template and German translation to current source code
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index f41ed2e..4610e4c 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -30,8 +30,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.}]
##
## Tcl/Tk sanity check
-if {[catch {package require Tcl 8.6} err]
- || [catch {package require Tk 8.6} err]
+if {[catch {package require Tcl 8.5} err]
+ || [catch {package require Tk 8.5} err]
} {
catch {wm withdraw .}
tk_messageBox \
@@ -2205,11 +2205,13 @@ proc do_gitk {revs {is_submodule false}} {
set env(GIT_WORK_TREE) $_gitworktree
cd $pwd
- set status_operation [$::main_status \
- start \
- [mc "Starting %s... please wait..." "gitk"]]
+ if {[info exists main_status]} {
+ set status_operation [$::main_status \
+ start \
+ [mc "Starting %s... please wait..." "gitk"]]
- after 3500 [list $status_operation stop]
+ after 3500 [list $status_operation stop]
+ }
}
}