KEMBAR78
Comparing 2fff509442...fb4db1a298 · git/git · GitHub
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2fff509442
Choose a base ref
...
head repository: git/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fb4db1a298
Choose a head ref
  • 3 commits
  • 8 files changed
  • 1 contributor

Commits on Jun 21, 2019

  1. status: add status.aheadbehind setting 

    The --[no-]ahead-behind option was introduced in fd9b544
(status: add --[no-]ahead-behind to status and commit for V2
format, 2018-01-09). This is a necessary change of behavior
in repos where the remote tracking branches can move very
quickly ahead of the local branches. However, users need to
remember to provide the command-line argument every time.

Add a new "status.aheadBehind" config setting to change the
default behavior of all git status formats.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @jeffhostetler @gitster
    jeffhostetler authored and gitster committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    06b324c View commit details
    Browse the repository at this point in the history

  2. status: warn when a/b calculation takes too long 

    The ahead/behind calculation in 'git status' can be slow in some
cases. Users may not realize that there are ways to avoid this
computation, especially if they are not using the information.

Add a warning that appears if this calculation takes more than
two seconds. The warning can be disabled through the new config
setting advice.statusAheadBehind.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @jeffhostetler @gitster
    jeffhostetler authored and gitster committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    0a53561 View commit details
    Browse the repository at this point in the history

  3. status: ignore status.aheadbehind in porcelain formats 

    Teach porcelain V[12] formats to ignore the status.aheadbehind
config setting. They only respect the --[no-]ahead-behind
command line argument.  This is for backwards compatibility
with existing scripts.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @jeffhostetler @gitster
    jeffhostetler authored and gitster committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    fb4db1a View commit details
    Browse the repository at this point in the history
Loading