From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff Hostetler <git@jeffhostetler.com>
Cc: git@vger.kernel.org, gitster@pobox.com, peff@peff.net,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: Re: [PATCH v2 1/5] core.aheadbehind: add new config setting
Date: Thu, 21 Dec 2017 12:43:56 -0800 [thread overview]
Message-ID: <20171221204356.GA58971@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <20171221190909.62995-2-git@jeffhostetler.com>
Hi,
Jeff Hostetler wrote:
> Created core.aheadbehind config setting and core_ahead_behind
> global variable. This value defaults to true.
>
> This value will be used in the next few commits as the default value
> for the --ahead-behind parameter.
>
> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
> ---
> Documentation/config.txt | 8 ++++++++
> cache.h | 1 +
> config.c | 5 +++++
> environment.c | 1 +
> 4 files changed, 15 insertions(+)
Not a reason to reroll on its own, but this seems out of order: the
series is easier to explain and easier to merge down in stages if the
patch for --ahead-behind comes first, then the config setting.
More generally, new commandline flags tend to be less controversial
than new config settings since they cannot affect a script by mistake,
and for that reason, they can go earlier in the series.
As a bonus, that makes it possible to include tests. It's probably
worth adding a test or two for this new config setting.
[...]
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 9593bfa..c78d6be 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -895,6 +895,14 @@ core.abbrev::
> abbreviated object names to stay unique for some time.
> The minimum length is 4.
>
> +core.aheadbehind::
> + If true, tells commands like status and branch to print ahead and
> + behind counts for the branch relative to its upstream branch.
> + This computation may be very expensive when there is a great
> + distance between the two branches. If false, these commands
> + only print that the two branches refer to different commits.
> + Defaults to true.
This doesn't seem like a particularly core feature to me. Should it be
e.g. status.aheadbehind (even though it also affects "git branch") or
even something like diff.aheadbehind? I'm not sure.
I also wonder if there's a way to achieve the same benefit without
having it be configurable. E.g. if a branch is way behind, couldn't
we terminate the walk early to get the same bounded cost per branch
without requiring configuration?
Thanks,
Jonathan
next prev parent reply other threads:[~2017-12-21 20:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-21 19:09 [PATCH v2 0/5] Add --no-ahead-behind to status Jeff Hostetler
2017-12-21 19:09 ` [PATCH v2 1/5] core.aheadbehind: add new config setting Jeff Hostetler
2017-12-21 20:21 ` Igor Djordjevic
2017-12-21 20:43 ` Jonathan Nieder [this message]
2017-12-22 18:21 ` Junio C Hamano
2017-12-24 14:33 ` Jeff King
2017-12-27 17:41 ` Junio C Hamano
2018-01-04 19:26 ` Jeff King
2018-04-03 9:54 ` Lars Schneider
2018-04-03 10:18 ` Ævar Arnfjörð Bjarmason
2018-04-03 11:39 ` Derrick Stolee
2018-04-03 13:47 ` Jeff Hostetler
2018-01-02 21:54 ` Jeff Hostetler
2018-01-02 22:17 ` Jonathan Nieder
2017-12-21 19:09 ` [PATCH v2 2/5] stat_tracking_info: return +1 when branches are not equal Jeff Hostetler
2017-12-21 20:48 ` Jonathan Nieder
2017-12-21 19:09 ` [PATCH v2 3/5] status: add --[no-]ahead-behind to porcelain V2 output Jeff Hostetler
2017-12-21 20:57 ` Jonathan Nieder
2017-12-21 19:09 ` [PATCH v2 4/5] status: update short status to use --no-ahead-behind Jeff Hostetler
2017-12-21 19:09 ` [PATCH v2 5/5] status: support --no-ahead-behind in long format 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=20171221204356.GA58971@aiede.mtv.corp.google.com \
--to=jrnieder@gmail.com \
--cc=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).