diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:24 -0800 |
| commit | 4094e47fd2c49fcdbd0152d20ed4d610d72680d7 (patch) | |
| tree | 6f444715c2f37cf75953f4df436b6adda1483357 /builtin/checkout.c | |
| parent | c710d182ea6d3846f6f2dc6f1b6c7dbd35c2fce8 (diff) | |
| parent | f39a757dd93488103dde76e992a75edf2d772b62 (diff) | |
Merge branch 'jh/status-no-ahead-behind'
"git status" can spend a lot of cycles to compute the relation
between the current branch and its upstream, which can now be
disabled with "--no-ahead-behind" option.
* jh/status-no-ahead-behind:
status: support --no-ahead-behind in long format
status: update short status to respect --no-ahead-behind
status: add --[no-]ahead-behind to status and commit for V2 format.
stat_tracking_info: return +1 when branches not equal
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index a52af2e507..8f4dfb1046 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -609,7 +609,7 @@ static void report_tracking(struct branch_info *new_branch_info) struct strbuf sb = STRBUF_INIT; struct branch *branch = branch_get(new_branch_info->name); - if (!format_tracking_info(branch, &sb)) + if (!format_tracking_info(branch, &sb, AHEAD_BEHIND_FULL)) return; fputs(sb.buf, stdout); strbuf_release(&sb); |