[PATCH 1/3] branch: only perform HEAD check for local branches
- From
Jeff King <peff@peff.net>
- Date
- Jul 9, 2017, 09:58 UTC
- Message-ID
- <20170709095810.vtwclyvqbayit2u6@sigill.intra.peff.net>
- 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