From patchwork Mon Feb 17 16:10:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pratyush Yadav X-Patchwork-Id: 11386725 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F24F14E3 for ; Mon, 17 Feb 2020 16:11:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59A5220718 for ; Mon, 17 Feb 2020 16:11:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728653AbgBQQLA (ORCPT ); Mon, 17 Feb 2020 11:11:00 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:54351 "EHLO relay11.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726866AbgBQQLA (ORCPT ); Mon, 17 Feb 2020 11:11:00 -0500 Received: from localhost.localdomain (unknown [103.227.98.241]) (Authenticated sender: me@yadavpratyush.com) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 34FD3100005; Mon, 17 Feb 2020 16:10:57 +0000 (UTC) From: Pratyush Yadav To: Cc: Jonathan Gilbert , Robert Luberda Subject: [PATCH] git-gui: add missing close bracket Date: Mon, 17 Feb 2020 21:40:56 +0530 Message-Id: <20200217161056.10864-1-me@yadavpratyush.com> X-Mailer: git-send-email 2.21.1 MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- Reported at https://github.com/prati0100/git-gui/issues/28 lib/merge.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.1 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 {