[PATCH] git-gui: add missing close bracket

Pratyush Yadav· Feb 17, 2020, 16:10 UTC · lore

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(-)

Show changes to lib/merge.tcl +1 −2

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 {
--
2.21.1

Pratyush Yadav· Feb 18, 2020, 17:32 UTC · re: Pratyush Yadav · lore

Re: [PATCH] git-gui: add missing close bracket

On 17/02/20 09:40PM, Pratyush Yadav wrote:

Show 9 quoted lines

> 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.

-- 
Regards,
Pratyush Yadav

patchgit-gui: add missing close bracket