From: Jeff Hostetler <git@jeffhostetler.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: [PATCH v3 0/5] Add --no-ahead-behind to status
Date: Wed, 3 Jan 2018 21:47:28 +0000 [thread overview]
Message-ID: <20180103214733.797-1-git@jeffhostetler.com> (raw)
From: Jeff Hostetler <jeffhost@microsoft.com>
This is version 3 of my patch series to avoid expensive
ahead/behind calculations in status. This version tries
to address most of the comments in V2.
I've switched back to a "status.aheadBehind" config setting
rather than in "core.*". This has been better integrated
with the existing status_deferred_config mechanism in
builtin/commit.c and lets both status and commit inherit it.
Config values of true and false control non-porcelain formats
for compatibility reasons as previously discussed. In the
last commit I added a new value of 2 for the config setting
to allow porcelain formats to inherit the new setting. I've
marked this experimental for now or so that we can discuss
it.
Jeff Hostetler (5):
stat_tracking_info: return +1 when branches not equal
status: add --[no-]ahead-behind to status and commit for V2 format.
status: update short status to respect --no-ahead-behind
status: support --no-ahead-behind in long format
status: add status.aheadBehind value for porcelain output
Documentation/config.txt | 11 ++++++
Documentation/git-status.txt | 5 +++
builtin/checkout.c | 2 +-
builtin/commit.c | 37 +++++++++++++++++++-
ref-filter.c | 8 ++---
remote.c | 42 +++++++++++++++++------
remote.h | 20 +++++++++--
t/t6040-tracking-info.sh | 82 ++++++++++++++++++++++++++++++++++++++++++++
t/t7064-wtstatus-pv2.sh | 73 +++++++++++++++++++++++++++++++++++++++
wt-status.c | 38 +++++++++++++++-----
wt-status.h | 2 ++
11 files changed, 292 insertions(+), 28 deletions(-)
--
2.9.3
next reply other threads:[~2018-01-03 21:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 21:47 Jeff Hostetler [this message]
2018-01-03 21:47 ` [PATCH v3 1/5] stat_tracking_info: return +1 when branches not equal Jeff Hostetler
2018-01-04 21:41 ` Junio C Hamano
2018-01-03 21:47 ` [PATCH v3 2/5] status: add --[no-]ahead-behind to status and commit for V2 format Jeff Hostetler
2018-01-04 22:05 ` Junio C Hamano
2018-01-05 16:31 ` Jeff Hostetler
2018-01-03 21:47 ` [PATCH v3 3/5] status: update short status to respect --no-ahead-behind Jeff Hostetler
2018-01-03 21:47 ` [PATCH v3 4/5] status: support --no-ahead-behind in long format Jeff Hostetler
2018-01-03 21:47 ` [PATCH v3 5/5] status: add status.aheadBehind value for porcelain output Jeff Hostetler
2018-01-04 23:06 ` [PATCH v3 0/5] Add --no-ahead-behind to status Jeff King
2018-01-05 16:46 ` Jeff Hostetler
2018-01-05 19:56 ` Junio C Hamano
2018-01-08 6:37 ` Jeff King
2018-01-08 14:22 ` Jeff Hostetler
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=20180103214733.797-1-git@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=peff@peff.net \
/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).