From fc5647e569c93ff0c3a70b969ebfd9157456ed77 Mon Sep 17 00:00:00 2001 From: Isengart Date: Thu, 9 Apr 2020 13:16:26 +0200 Subject: [PATCH 1/3] Fix git-gui.sh --- git-gui.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 4610e4ca72..faaf93b431 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2600,12 +2600,12 @@ proc toggle_or_diff {mode w args} { update_indexinfo \ "Unstaging [short_path $path] from commit" \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } elseif {$w eq $ui_workdir} { update_index \ "Adding [short_path $path]" \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } } else { set selected_paths($path) 1 From a05cc88674122dc650723d33ee406dfc3ec0269a Mon Sep 17 00:00:00 2001 From: Isengart Date: Thu, 9 Apr 2020 13:17:49 +0200 Subject: [PATCH 2/3] Fix index.tcl --- lib/index.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/index.tcl b/lib/index.tcl index 1fc5b42300..59d1f7542a 100644 --- a/lib/index.tcl +++ b/lib/index.tcl @@ -60,7 +60,7 @@ proc rescan_on_error {err {after {}}} { $::main_status stop_all unlock_index - rescan [concat $after [list ui_ready]] 0 + rescan [concat $after {ui_ready;}] 0 } proc update_indexinfo {msg path_list after} { @@ -314,7 +314,7 @@ proc unstage_helper {txt paths} { update_indexinfo \ $txt \ $path_list \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } } From d04e6ac3c2da93f488bc89fda66c35445220becd Mon Sep 17 00:00:00 2001 From: Isengart Date: Thu, 9 Apr 2020 13:18:53 +0200 Subject: [PATCH 3/3] Fix mergetool.tcl --- lib/mergetool.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 120bc4064b..e688b016ef 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -59,7 +59,7 @@ proc merge_add_resolution {path} { update_index \ [mc "Adding resolution for %s" [short_path $path]] \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } proc merge_force_stage {stage} {