aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPratyush Yadav <me@yadavpratyush.com>2020-02-17 21:34:45 +0530
committerPratyush Yadav <me@yadavpratyush.com>2020-02-17 21:34:45 +0530
commit6b9919c0a21ab516626f5e1849293df7cda1dd64 (patch)
treea5b1bc53e2d2d49ae2acc970b962aafde2fe0195
parent5897e5ac965a17e0396039f5d236a7608265e691 (diff)
downloadgit-6b9919c0a21ab516626f5e1849293df7cda1dd64.tar.xz
git-gui: add missing close bracket
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>
-rw-r--r--lib/merge.tcl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl
index 8df8ffae55..664803cf3f 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 {