From: Jeff King <peff@peff.net>
To: Leo Razoumov <slonik.az@gmail.com>
Cc: Karthik Nayak <karthik.188@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 1/3] branch: only perform HEAD check for local branches
Date: Sun, 9 Jul 2017 05:58:10 -0400 [thread overview]
Message-ID: <20170709095810.vtwclyvqbayit2u6@sigill.intra.peff.net> (raw)
In-Reply-To: <20170709095708.moymrozmqdv2oixx@sigill.intra.peff.net>
When assembling the ref-filter format to show "git branch"
output, we put the "%(if)%(HEAD)" conditional at the start
of the overall format. But there's no point in checking
whether a remote branch matches HEAD, as it never will.
The check should go inside the local conditional; we
assemble that format inside the "local" strbuf.
By itself, this is just a minor optimization. But in a
future patch, we'll need this refactoring to fix
local-branch coloring.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/branch.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index c958e9325..a849373b7 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -335,8 +335,9 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r
struct strbuf local = STRBUF_INIT;
struct strbuf remote = STRBUF_INIT;
- strbuf_addf(&fmt, "%%(if)%%(HEAD)%%(then)* %s%%(else) %%(end)",
+ strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else) %%(end)",
branch_get_color(BRANCH_COLOR_CURRENT));
+ strbuf_addf(&remote, " ");
if (filter->verbose) {
struct strbuf obname = STRBUF_INIT;
--
2.13.2.1066.gabaed60bd
next prev parent reply other threads:[~2017-07-09 9:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-08 19:13 git-2.13.2: color.branch.local problem Leo Razoumov
2017-07-09 9:28 ` Jeff King
2017-07-09 9:57 ` Jeff King
2017-07-09 9:58 ` Jeff King [this message]
2017-07-09 9:59 ` [PATCH 2/3] branch: use BRANCH_COLOR_LOCAL in ref-filter format Jeff King
2017-07-09 10:00 ` [PATCH 3/3] branch: set remote color in ref-filter branch immediately Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170709095810.vtwclyvqbayit2u6@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=karthik.188@gmail.com \
--cc=slonik.az@gmail.com \
/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.
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).