Skip to content

Bugfix/ui ready issues #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Isengart wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Bugfix/ui ready issues #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc5647e
Fix git-gui.sh
Isengart Apr 9, 2020
a05cc88
Fix index.tcl
Isengart Apr 9, 2020
d04e6ac
Fix mergetool.tcl
Isengart Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions git-gui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/index.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} {
Expand Down Expand Up @@ -314,7 +314,7 @@ proc unstage_helper {txt paths} {
update_indexinfo \
$txt \
$path_list \
[concat $after [list ui_ready]]
[concat $after {ui_ready;}]
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/mergetool.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} {
Expand Down