[PATCH] git-gui: fix concatenation of ui_ready by adding ";"
From: =?UTF-8?q?Ansgar=20R=C3=B6ber?= <ansgar.roeber@rwth-aachen.de>
This fixes https://github.com/git-for-windows/git/issues/2469
Signed-off-by: Ansgar Röber <ansgar.roeber@rwth-aachen.de>
---
git-gui: fix concatenation of ui_ready by adding ";"
This fixes https://github.com/git-for-windows/git/issues/2469Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-607%2FIsengart%2Ffix-stage-to-commit-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-607/Isengart/fix-stage-to-commit-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/607
git-gui.sh | 4 ++--
lib/index.tcl | 4 ++--
lib/mergetool.tcl | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index 4610e4ca72a..faaf93b431a 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
diff --git a/lib/index.tcl b/lib/index.tcl
index 1fc5b42300d..59d1f7542a8 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;}]
}
}
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 120bc4064b6..e688b016ef6 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} {
base-commit: a5728022e07c53e5ac91db0960870518e243b7c1
--
gitgitgadget