From: Junio C Hamano Date: Fri, 2 Mar 2018 20:18:20 +0000 (-0800) Subject: Merge branch 'jh/status-no-ahead-behind' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/68bde8d571b76534e8c531c195acc998db60ed02 Merge branch 'jh/status-no-ahead-behind' into next "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 --- 68bde8d571b76534e8c531c195acc998db60ed02 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);