From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Mar 2018 20:36:24 +0000 (-0800)
Subject: Merge branch 'jh/status-no-ahead-behind'
X-Git-Tag: v2.17.0-rc0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4094e47fd2c49fcdbd0152d20ed4d610d72680d7;p=thirdparty%2Fgit.git

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
---

4094e47fd2c49fcdbd0152d20ed4d610d72680d7
diff --cc builtin/checkout.c
index a52af2e507,70d5785a5d..8f4dfb1046
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -604,12 -605,12 +604,12 @@@ static int merge_working_tree(const str
  	return 0;
  }
  
 -static void report_tracking(struct branch_info *new)
 +static void report_tracking(struct branch_info *new_branch_info)
  {
  	struct strbuf sb = STRBUF_INIT;
 -	struct branch *branch = branch_get(new->name);
 +	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);