kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'py/blame-status-error' 

Fixes an error popup in blame because of a missing closing bracket.

* py/blame-status-error:
  git-gui: fix error popup when doing blame -> "Show History Context"
maint
Pratyush Yadav 2020-03-14 22:41:45 +05:30
parent 63a58457e0 5eb9397e88
commit d769dcc5cd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-gui.sh
View File

@ -2205,6 +2205,7 @@ proc do_gitk {revs {is_submodule false}} {
set env(GIT_WORK_TREE) $_gitworktree set env(GIT_WORK_TREE) $_gitworktree
cd $pwd cd $pwd


if {[info exists main_status]} {
set status_operation [$::main_status \ set status_operation [$::main_status \
start \ start \
[mc "Starting %s... please wait..." "gitk"]] [mc "Starting %s... please wait..." "gitk"]]
@ -2212,6 +2213,7 @@ proc do_gitk {revs {is_submodule false}} {
after 3500 [list $status_operation stop] after 3500 [list $status_operation stop]
} }
} }
}


proc do_git_gui {} { proc do_git_gui {} {
global current_diff_path global current_diff_path