All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pratyush Yadav <me@yadavpratyush.com>
To: <git@vger.kernel.org>
Cc: Jonathan Gilbert <JonathanG@iQmetrix.com>,
	Robert Luberda <robert@debian.org>
Subject: [PATCH] git-gui: add missing close bracket
Date: Mon, 17 Feb 2020 21:40:56 +0530	[thread overview]
Message-ID: <20200217161056.10864-1-me@yadavpratyush.com> (raw)

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


             reply	other threads:[~2020-02-17 16:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-17 16:10 Pratyush Yadav [this message]
2020-02-18 17:32 ` [PATCH] git-gui: add missing close bracket Pratyush Yadav

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200217161056.10864-1-me@yadavpratyush.com \
    --to=me@yadavpratyush.com \
    --cc=JonathanG@iQmetrix.com \
    --cc=git@vger.kernel.org \
    --cc=robert@debian.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.