* [PATCH] git-gui: add missing close bracket
@ 2020-02-17 16:10 Pratyush Yadav
2020-02-18 17:32 ` Pratyush Yadav
0 siblings, 1 reply; 2+ messages in thread
From: Pratyush Yadav @ 2020-02-17 16:10 UTC (permalink / raw)
To: git; +Cc: Jonathan Gilbert, Robert Luberda
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-gui: add missing close bracket
2020-02-17 16:10 [PATCH] git-gui: add missing close bracket Pratyush Yadav
@ 2020-02-18 17:32 ` Pratyush Yadav
0 siblings, 0 replies; 2+ messages in thread
From: Pratyush Yadav @ 2020-02-18 17:32 UTC (permalink / raw)
To: git; +Cc: Jonathan Gilbert, Robert Luberda
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.
--
Regards,
Pratyush Yadav
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-18 17:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-17 16:10 [PATCH] git-gui: add missing close bracket Pratyush Yadav
2020-02-18 17:32 ` Pratyush Yadav
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).