diff options
| author | Pratyush Yadav <me@yadavpratyush.com> | 2020-05-05 17:31:05 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2020-05-05 17:31:05 +0530 |
| commit | 88db24d724619d6c2e602c3b56016f59326d31e3 (patch) | |
| tree | 5bfca451d4e4238151e3766db8d912d7295cadd1 | |
| parent | a5728022e07c53e5ac91db0960870518e243b7c1 (diff) | |
| parent | 19195fbd73994d05abaa0a2976143da96b320f47 (diff) | |
| download | git-88db24d724619d6c2e602c3b56016f59326d31e3.tar.xz | |
Merge branch 'ar/ui-ready-semicolon'
Fix syntax error popups because of missing semicolons.
* ar/ui-ready-semicolon:
Subject: git-gui: fix syntax error because of missing semicolon
| -rwxr-xr-x | git-gui.sh | 4 | ||||
| -rw-r--r-- | lib/index.tcl | 6 | ||||
| -rw-r--r-- | lib/mergetool.tcl | 2 |
3 files changed, 6 insertions, 6 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 diff --git a/lib/index.tcl b/lib/index.tcl index 1fc5b42300..d2ec24bd80 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;}] } } @@ -366,7 +366,7 @@ proc add_helper {txt paths} { update_index \ $txt \ $path_list \ - [concat $after {ui_status [mc "Ready to commit."]}] + [concat $after {ui_status [mc "Ready to commit."];}] } } 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} { |