| Message ID | 20200217161056.10864-1-me@yadavpratyush.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | git-gui: add missing close bracket | expand |
On 17/02/20 09:40PM, Pratyush Yadav wrote: > In d9c6469 (git-gui: update status bar to track operations, 2019-12-01), > the status bar was refactored to allow multiple overlapping operations. > > Since the refactor changed the status bar interface, all callsites had > to be refactored to use the new interface. During that refactoring, this > closing bracket was missed. This leads to an error message popping up > when doing 'Branch->Reset...'. > > Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> Merged.
diff --git a/lib/merge.tcl b/lib/merge.tcl index 8df8ffa..664803c 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -244,7 +244,7 @@ Continue with resetting the current changes?"] set status_bar_operation [$::main_status \ start \ [mc "Aborting"] \ - [mc "files reset"] + [mc "files reset"]] fileevent $fd readable [namespace code [list \ _reset_wait $fd $status_bar_operation]] } else {
In d9c6469 (git-gui: update status bar to track operations, 2019-12-01), the status bar was refactored to allow multiple overlapping operations. Since the refactor changed the status bar interface, all callsites had to be refactored to use the new interface. During that refactoring, this closing bracket was missed. This leads to an error message popping up when doing 'Branch->Reset...'. Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> --- Reported at https://github.com/prati0100/git-gui/issues/28 lib/merge.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.1