diff options
Diffstat (limited to 'git-gui/lib/index.tcl')
| -rw-r--r-- | git-gui/lib/index.tcl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index 1254145634..d2ec24bd80 100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/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."];}] } } @@ -436,7 +436,7 @@ proc revert_helper {txt paths} { # # The asynchronous operations are each indicated below by a comment # before the code block that starts the async operation. - set after_chord [SimpleChord new { + set after_chord [SimpleChord::new { if {[string trim $err] != ""} { rescan_on_error $err } else { @@ -522,10 +522,11 @@ proc revert_helper {txt paths} { ] if {$reply == 1} { + set note [$after_chord add_note] checkout_index \ $txt \ $path_list \ - [$after_chord add_note] \ + [list $note activate] \ $capture_error } } @@ -567,14 +568,15 @@ proc revert_helper {txt paths} { if {$reply == 1} { $after_chord eval { set should_reshow_diff 1 } - delete_files $untracked_list [$after_chord add_note] + set note [$after_chord add_note] + delete_files $untracked_list [list $note activate] } } # Activate the common note. If no other notes were created, this # completes the chord. If other notes were created, then this common # note prevents a race condition where the chord might complete early. - $after_common_note + $after_common_note activate } # Delete all of the specified files, performing deletion in batches to allow the |