From d7d1b496aeea5a151c826683ed28c57ef0ac9389 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Tue, 9 Jan 2018 18:50:15 +0000 Subject: stat_tracking_info: return +1 when branches not equal Extend stat_tracking_info() to return +1 when branches are not equal and to take a new "enum ahead_behind_flags" argument to allow skipping the (possibly expensive) ahead/behind computation. This will be used in the next commit to allow "git status" to avoid full ahead/behind calculations for performance reasons. Signed-off-by: Jeff Hostetler Signed-off-by: Junio C Hamano --- remote.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'remote.h') diff --git a/remote.h b/remote.h index 1f6611be21..80240f0ada 100644 --- a/remote.h +++ b/remote.h @@ -257,9 +257,15 @@ enum match_refs_flags { MATCH_REFS_FOLLOW_TAGS = (1 << 3) }; +/* Flags for --ahead-behind option. */ +enum ahead_behind_flags { + AHEAD_BEHIND_QUICK = 0, /* just eq/neq reporting */ + AHEAD_BEHIND_FULL = 1, /* traditional a/b reporting */ +}; + /* Reporting of tracking info */ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, - const char **upstream_name); + const char **upstream_name, enum ahead_behind_flags abf); int format_tracking_info(struct branch *branch, struct strbuf *sb); struct ref *get_local_heads(void); -- cgit v1.2.3