diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/git-gui/lib/merge.tcl | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/git-gui/lib/merge.tcl')
| -rw-r--r-- | third_party/git/git-gui/lib/merge.tcl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/third_party/git/git-gui/lib/merge.tcl b/third_party/git/git-gui/lib/merge.tcl index 664803cf3f..9f253db5b3 100644 --- a/third_party/git/git-gui/lib/merge.tcl +++ b/third_party/git/git-gui/lib/merge.tcl @@ -241,27 +241,23 @@ Continue with resetting the current changes?"] if {[ask_popup $op_question] eq {yes}} { set fd [git_read --stderr read-tree --reset -u -v HEAD] fconfigure $fd -blocking 0 -translation binary - set status_bar_operation [$::main_status \ - start \ - [mc "Aborting"] \ - [mc "files reset"]] - fileevent $fd readable [namespace code [list \ - _reset_wait $fd $status_bar_operation]] + fileevent $fd readable [namespace code [list _reset_wait $fd]] + $::main_status start [mc "Aborting"] [mc "files reset"] } else { unlock_index } } -proc _reset_wait {fd status_bar_operation} { +proc _reset_wait {fd} { global ui_comm - $status_bar_operation update_meter [read $fd] + $::main_status update_meter [read $fd] fconfigure $fd -blocking 1 if {[eof $fd]} { set fail [catch {close $fd} err] + $::main_status stop unlock_index - $status_bar_operation stop $ui_comm delete 0.0 end $ui_comm edit modified false |