diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-10 14:28:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-10 14:28:23 -0700 |
| commit | ab427cd991100e94792fce124b0934135abdea4b (patch) | |
| tree | f58047387847efb256ba62a0e121f2293ebd48d1 /git-gui/lib | |
| parent | f2457a6f4ba4ae8078fa7559f6292786a287f696 (diff) | |
| parent | 7ef77ec0054b3b4ef3cfee6ef97c43c01965be88 (diff) | |
| download | git-ab427cd991100e94792fce124b0934135abdea4b.tar.gz | |
Merge branch 'master' of https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui:
git-gui: sync Makefiles with git.git
git-gui: fix error handling of Revert Changes command
git-gui--askyesno (mingw): use Git for Windows' icon, if available
git-gui--askyesno: allow overriding the window title
git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
git-gui: provide question helper for retry fallback on Windows
git-gui: simplify using nice(1)
git-gui: simplify PATH de-duplication
Diffstat (limited to 'git-gui/lib')
| -rw-r--r-- | git-gui/lib/index.tcl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index 7aa09c7728..e1d38e54be 100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/lib/index.tcl @@ -425,6 +425,11 @@ proc revert_helper {txt paths} { if {![lock_index begin-update]} return + # Workaround for Tcl < 9.0: chord namespaces are not obeyed and + # operated in the global namespace. This clears an error that could + # have been left over from a previous operation. + set ::err {} + # Common "after" functionality that waits until multiple asynchronous # operations are complete (by waiting for them to activate their notes # on the chord). @@ -432,7 +437,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 { - if {[string trim $err] != ""} { + if {[info exists err] && [string trim $err] ne ""} { rescan_on_error $err } else { unlock_index |