diff options
| author |  Pratyush Yadav <me@yadavpratyush.com> | 2020-03-19 21:29:19 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2020-03-19 21:29:19 +0530 |
| commit | a5728022e07c53e5ac91db0960870518e243b7c1 (patch) | |
| tree | 088699d08cb99dcfd2030d137659f412c6ae40cb /lib/index.tcl | |
| parent | Merge branch 'js/askpass-coerce-utf8' (diff) | |
| parent | git-gui: create a new namespace for chord script evaluation (diff) | |
| download | tgif-a5728022e07c53e5ac91db0960870518e243b7c1.tar.xz | |
Merge branch 'py/remove-tcloo'
Reduce the Tcl version requirement to 8.5 to allow git-gui to run on
MacOS distributions like High Sierra. While here, fix a potential
variable name collision.
* py/remove-tcloo:
git-gui: create a new namespace for chord script evaluation
git-gui: reduce Tcl version requirement from 8.6 to 8.5
Diffstat (limited to 'lib/index.tcl')
| -rw-r--r-- | lib/index.tcl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/index.tcl b/lib/index.tcl index 1254145634..1fc5b42300 100644 --- a/lib/index.tcl +++ b/lib/index.tcl @@ -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 |