undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/ui-ready-semicolon'

Browse Source 
Fix syntax error popups because of missing semicolons.

* ar/ui-ready-semicolon:
  Subject: git-gui: fix syntax error because of missing semicolon
This commit is contained in:
Pratyush Yadav 2020-05-05 17:31:05 +05:30
commit 88db24d724
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-gui.sh
View File

@ -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

6
lib/index.tcl
View File

@ -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."];}]
}
}

2
lib/mergetool.tcl
View File

@ -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} {